IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

replacing the remnants of the old color variable code

Browse Source
This commit is contained in:
awesomerobot
2015-06-14 22:59:49 -04:00
parent 04288c14ff
commit f20c28c16b
35 changed files with 109 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/mobile/compose.scss
View File

@@ -39,7 +39,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com
width: 100%;
z-index: 1039;
height: 0;
background-color: scale-color-diff();
background-color: dark-light-diff($primary, $secondary, 90%, -60%);
bottom: 0;
font-size: 1em;
position: fixed;
@@ -88,7 +88,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com
&.draft {
height: 35px !important;
cursor: pointer;
border-top: 1px solid scale-color-diff();
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.draft-text {
display: block;
position: absolute;
@@ -103,7 +103,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com
}
&.saving {
height: 40px !important;
border-top: 1px solid scale-color-diff();
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.saving-text {
display: block;
}

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

@@ -9,7 +9,7 @@
line-height: 2em;
}
#revision-details {
background-color: scale-color-diff();
background-color: dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px;
margin-top: 10px;
}

2
app/assets/stylesheets/mobile/topic-list.scss
View File

@@ -237,7 +237,7 @@ tr.category-topic-link {
margin: 1px 0 0;
list-style: none;
background-color: $secondary;
border: 1px solid scale-color-diff();
border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 5px;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);

8
app/assets/stylesheets/mobile/topic-post.scss
View File

@@ -1,5 +1,5 @@
.gap {
background-color: scale-color-diff();
background-color: dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px 15px;
color: $primary;
text-align: center;
@@ -7,7 +7,7 @@
}
.topic-post {
border-top: 1px solid scale-color-diff();
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 6px 0 3px 0;
}
@@ -74,7 +74,7 @@ button {
background-color: $secondary;
width: 205px;
padding: 10px;
border: 1px solid scale-color-diff();
border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
position: absolute;
text-align: left;
bottom: 0;
@@ -286,7 +286,7 @@ a.star {
}
#topic-footer-buttons {
border-top: 1px solid scale-color-diff();
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 20px 10px 0 10px;
.fa-bookmark.bookmarked { color: $tertiary; }
}

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

@@ -61,7 +61,7 @@
}
#topic-progress-expanded {
border: 1px solid scale-color-diff();
border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px;
background: $secondary;
box-shadow: 0 0px 2px rgba(0,0,0, .2);

8
app/assets/stylesheets/mobile/user.scss
View File

@@ -186,7 +186,7 @@
.user-content {
padding: 10px 8px;
background-color: $secondary;
border: 1px solid scale-color-diff();
border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
margin-bottom: 10px;
box-sizing: border-box;
margin-top: 20px;
@@ -205,13 +205,13 @@
th {
text-align: left;
border-bottom: 1px solid scale-color-diff();
border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px;
}
td {
padding: 5px;
border-bottom: 1px solid scale-color-diff();
border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
}
}
}
@@ -420,7 +420,7 @@
.item {
padding: 20px 0 15px 0;
background-color: $secondary;
border-bottom: 1px solid scale-color-diff();
border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
}
.type {
color: $primary;