Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing unneeded and duplicate styles

This commit is contained in:
Kris 2018-02-23 21:41:40 -05:00
parent 82e68670bf
commit b731d5d9b5
18 changed files with 89 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/stylesheets/common/base/directory.scss
View File

@ -1,10 +1,10 @@
.directory {
margin-bottom: 100px;
.user-info {
margin-bottom: 0;
}
.period-chooser {
float: left;
}
@ -18,16 +18,16 @@
.spinner {
clear: both;
}
table {
width: 100%;
margin-bottom: 1em;
td, th {
padding: 0.5em;
text-align: left;
border-bottom: 1px solid $primary-low;
.number, .time-read {
font-size: $font-up-3;
color: $primary-medium;
@ -36,21 +36,10 @@
white-space: nowrap;
}
}
tr.me {
td {
background-color: dark-light-choose($highlight-low, $highlight-medium);
.username a, .name, .title, .number, .time-read {
color: $primary-medium;
}
}
}
th.sortable {
cursor: pointer;
white-space: nowrap;
width: 13%;
.d-icon-heart {
color: $love;
@ -59,10 +48,16 @@
.d-icon-chevron-down, .d-icon-chevron-up {
margin-left: 0.5em;
}
&:hover {
background-color: $primary-low;
}
}
}
.me {
background-color: dark-light-choose($highlight-low, $highlight-medium);
.username a, .name, .title, .number, .time-read {
color: $primary-medium;
}
}
}

3
app/assets/stylesheets/common/base/header.scss
View File

@ -50,9 +50,6 @@
margin-left: 7px;
}
.d-header-icons {
float: right;
}
}
.header-dropdown-toggle, .drop-down, .panel-body {

6
app/assets/stylesheets/common/base/history.scss
View File

@ -24,6 +24,12 @@
}
}
#revision-details {
padding: 5px;
margin-top: 10px;
border-bottom: 3px solid $primary-low;
}
#revisions .row:first-of-type {
margin-top: 10px;
}

12
app/assets/stylesheets/common/base/login.scss
View File

@ -12,6 +12,18 @@
display: none;
}
#login-form {
a {
color: dark-light-choose($primary-high, $secondary-low);
}
td {
padding-right: 5px;
}
}
#new-account-link {
cursor: pointer;
}
$label-width: 92px;
$input-width: 220px;

54
app/assets/stylesheets/common/base/modal.scss
View File

@ -111,6 +111,7 @@
z-index: z("modal","content");
overflow: auto;
}
.modal-form {
margin-bottom: 0;
}
@ -156,6 +157,8 @@
.modal-body {
box-sizing: border-box;
width: 100%;
overflow-y: auto;
max-height: 400px;
&.full-height-modal {
max-height: calc(100vh - 150px);
}
@ -413,7 +416,6 @@
}
}
.change-timestamp {
.date-picker {
@ -434,5 +436,55 @@
form {
margin: 0;
}
}
.flag-modal {
max-height: 450px;
.flag-action-type-details {
line-height: $line-height-large;
}
}
.flag-message {
width: 95% !important;
margin: 0;
}
.custom-message-length {
color: dark-light-choose($primary-low-mid, $secondary-high);
font-size: $font-down-1;
}
.edit-category-modal {
.secure-category-options {
margin: 10px 0 0 16px;
.badge-list {
margin: 10px 0;
li {
margin: 0 4px 8px 0;
a {
color: dark-light-choose($primary-medium, $secondary-medium);
cursor: pointer;
}
a:hover {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
}
}
}
.tabbed-modal {
.modal-body {
position: relative;
height: 350px;
}
}
.modal-tab {
position: absolute;
width: 95%;
}

1
app/assets/stylesheets/desktop.scss
View File

@ -19,7 +19,6 @@
@import "desktop/user";
@import "desktop/history";
@import "desktop/queued-posts";
@import "desktop/menu-panel";
@import "desktop/group";
// Import all component-specific files

9
app/assets/stylesheets/desktop/history.scss
View File

@ -7,9 +7,6 @@
max-width: 960px;
}
#revision-controls {
float: left;
padding-right: 5px;
.btn[disabled] {
cursor: not-allowed;
background-color: $primary-low;
@ -32,11 +29,7 @@
font-weight: bold;
}
}
#revision-details {
padding: 5px;
margin-top: 10px;
border-bottom: 3px solid $primary-low;
}
#revisions {
word-wrap: break-word;
table {

13
app/assets/stylesheets/desktop/login.scss
View File

@ -12,21 +12,8 @@
margin-bottom: 20px;
}
#login-form {
a {
color: dark-light-choose($primary-high, $secondary-low);
}
td {
padding-right: 5px;
}
}
// Create account
#new-account-link {
cursor: pointer;
}
.create-account {
form {
margin-bottom: 0;

12
app/assets/stylesheets/desktop/menu-panel.scss
View File

@ -1,12 +0,0 @@
.docked #hamburger-menu {
position: fixed;
}
#hamburger-menu {
position: absolute;
top: 63px;
// compensate on the other end for this top
.hamburger-body {
bottom: 100px;
}
}

47
app/assets/stylesheets/desktop/modal.scss
View File

@ -22,8 +22,6 @@
}
.modal-body {
overflow-y: auto;
max-height: 400px;
padding: 15px;
}
@ -69,23 +67,6 @@
}
}
.flag-modal {
max-height: 450px;
.flag-action-type-details {
line-height: $line-height-large;
}
}
.custom-message-length {
color: dark-light-choose($primary-low-mid, $secondary-high);
font-size: $font-down-1;
}
.flag-message {
width: 95%;
margin: 0;
}
.edit-category-modal {
.modal-body {
position: relative;
@ -93,22 +74,6 @@
max-height: 420px;
padding-bottom: 0;
}
.secure-category-options {
margin: 10px 0 0 16px;
.badge-list {
margin: 10px 0;
li {
margin: 0 4px 8px 0;
a {
color: dark-light-choose($primary-medium, $secondary-medium);
cursor: pointer;
}
a:hover {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
}
}
.disable_info_wrap {
margin-top: -70px;
@ -147,18 +112,6 @@
max-width: 23%;
}
}
}
.tabbed-modal {
.modal-body {
position: relative;
height: 350px;
}
}
.modal-tab {
position: absolute;
width: 95%;
}
.split-modal {

1
app/assets/stylesheets/mobile.scss
View File

@ -18,7 +18,6 @@
@import "mobile/user";
@import "mobile/history";
@import "mobile/directory";
@import "mobile/menu-panel";
@import "mobile/search";
@import "mobile/emoji";
@import "mobile/ring";

20
app/assets/stylesheets/mobile/directory.scss
View File

@ -1,36 +1,18 @@
.user-controls {
padding: 1em;
}
.total-rows {
padding: 0.25em 0.5em;
}
.directory .user {
border-top: 1px solid $primary-low;
padding: 1em;
&.me {
background-color: dark-light-choose($highlight-low, $highlight-medium);
.username a, .name, .title, .number, .time-read, .user-stat .label {
color: scale-color($highlight, $lightness: -50%);
}
}
.user-stat {
margin-left: 55px;
.value {
font-weight: bold;
}
.label {
margin-left: 0.2em;
color: blend-primary-secondary(50%);
color: $primary-medium;
}
.d-icon-heart {
color: $love;
}
}
margin-bottom: 1em;
}

2
app/assets/stylesheets/mobile/emoji.scss
View File

@ -1,6 +1,4 @@
.emoji-picker {
box-shadow: none;
height: 250px;
border-radius: 0;
border: none;
}

3
app/assets/stylesheets/mobile/faqs.scss
View File

@ -4,7 +4,6 @@
.body-page {
margin-top: 20px;
margin-left: 15px;
width: 90%;
width: 100%;
padding-left: 0;
}

5
app/assets/stylesheets/mobile/history.scss
View File

@ -8,11 +8,6 @@
#revision-numbers {
line-height: $line-height-large;
}
#revision-details {
background-color: $primary-low;
padding: 5px;
margin-top: 10px;
}
img {
max-width: 95%;
height: auto;

10
app/assets/stylesheets/mobile/login.scss
View File

@ -15,9 +15,7 @@
}
#login-form {
a {
color: dark-light-choose($primary-high, $secondary-low);
}
label { float: left; display: block; }
textarea, input, select {
font-size: $font-up-1;
@ -31,12 +29,6 @@ a#new-account-link { white-space:nowrap; }
// Create account
#new-account-link {
cursor: pointer;
}
a#forgot-password-link {clear: left; float: left; }
.login-modal, .create-account {
.btn-primary {
margin-bottom: 10px;

7
app/assets/stylesheets/mobile/menu-panel.scss
View File

@ -1,7 +0,0 @@
.menu-panel {
span.badge-category {
max-width: 85px;
overflow: hidden;
text-overflow: ellipsis;
}
}

44
app/assets/stylesheets/mobile/modal.scss
View File

@ -22,8 +22,6 @@
top: 50%;
}
.modal-body {
overflow-y: auto;
max-height: 400px;
padding: 10px;
}
@ -70,27 +68,12 @@
}
}
.flag-modal {
max-height: 450px;
}
@media only screen and (max-device-width: 568px) {
.modal .flag-modal .flag-message {
height: 1.2em;
height: 3em;
}
}
.custom-message-length {
margin: -4px 0 10px 20px;
color: dark-light-choose($primary-high, $secondary-low);
font-size: $font-down-1;
}
.flag-message {
margin-left: 20px;
width: 95% !important;
}
.edit-category-modal {
.modal-body {
box-sizing: border-box;
@ -100,19 +83,6 @@
&.small .modal-body {
height: 310px;
}
.secure-category-options {
margin: 10px 0 0 16px;
.badge-list {
margin: 10px 0;
li {
margin: 0 4px 8px 0;
a {
color: #888;
cursor: pointer;
}
}
}
}
.disable_info_wrap .cannot_delete_reason {
top: -114px;
@ -121,18 +91,6 @@
}
}
.tabbed-modal {
.modal-body {
position: relative;
height: 350px;
}
}
.modal-tab {
position: absolute;
}
/* fixes for the new account confirm dialog on mobile */
.modal-inner-container {