Bladeren bron

work on colors

j8
Ilya Daynatovich 8 jaren geleden
bovenliggende
commit
cbc6943305
6 gewijzigde bestanden met toevoegingen van 23 en 17 verwijderingen
  1. 6
    4
      css/_contact_list.scss
  2. 2
    2
      css/_side_toolbar_container.scss
  3. 2
    2
      css/_toolbars.scss
  4. 2
    7
      css/_variables.scss
  5. 1
    1
      css/aui-components/dropdown.scss
  6. 10
    1
      css/themes/_light.scss

+ 6
- 4
css/_contact_list.scss Bestand weergeven

@@ -5,7 +5,7 @@
5 5
         font-size: 12px;
6 6
         bottom: 0px;
7 7
         margin: 0;
8
-        margin-top: 16px;
8
+        margin-top: 12px;
9 9
         padding: 0px;
10 10
         width: 100%;
11 11
     }
@@ -23,13 +23,14 @@
23 23
 #contacts {
24 24
 
25 25
     >li {
26
-        color: $defaultSideBarFontColor;
26
+        display: block;
27 27
         list-style-type: none;
28 28
         text-align: left;
29 29
         white-space: nowrap;
30 30
         color: $baseLight;
31
-        font-size: 18px;
32
-        padding: 6px 10%;
31
+        font-size: 16px;
32
+        padding: 0 10%;
33
+        height: 27px;
33 34
 
34 35
         &:hover,
35 36
         &:active {
@@ -41,6 +42,7 @@
41 42
             vertical-align: middle;
42 43
             margin: 0px;
43 44
             width: 100%;
45
+            line-height: 1.5em;
44 46
             text-overflow: ellipsis;
45 47
             overflow: hidden;
46 48
         }

+ 2
- 2
css/_side_toolbar_container.scss Bestand weergeven

@@ -64,14 +64,14 @@
64 64
          * Titles and subtitles of inner containers.
65 65
          */
66 66
         div.title, div.subTitle {
67
-            margin: 10px 0;
67
+            margin: 24px 0 11px;
68 68
         }
69 69
 
70 70
         /**
71 71
          * Main title size.
72 72
          */
73 73
         div.title {
74
-            color: $toolbarTitleColor !important;
74
+            color: $toolbarTitleColor;
75 75
             text-align: center;
76 76
             font-size: $toolbarTitleFontSize;
77 77
         }

+ 2
- 2
css/_toolbars.scss Bestand weergeven

@@ -252,7 +252,7 @@ a.button>#avatar {
252 252
  */
253 253
 @include keyframes(slideInExt) {
254 254
     from { width: 0px; }
255
-    to   { width: 200px; } // TO FIX: Make this value a percentage.
255
+    to   { width: $sidebarWidth; } // TO FIX: Make this value a percentage.
256 256
 }
257 257
 
258 258
 .slideInExt {
@@ -260,7 +260,7 @@ a.button>#avatar {
260 260
 }
261 261
 
262 262
 @include keyframes(slideOutExt) {
263
-  from { width: 200px; } // TO FIX: Make this value a percentage.
263
+  from { width: $sidebarWidth; } // TO FIX: Make this value a percentage.
264 264
   to   { width: 0px; }
265 265
 }
266 266
 

+ 2
- 7
css/_variables.scss Bestand weergeven

@@ -31,7 +31,7 @@ $tooltipBg: rgba(0,0,0, 0.7);
31 31
  * Toolbar
32 32
  */
33 33
 $toolbarTitleColor: #FFFFFF;
34
-$toolbarTitleFontSize: 24px;
34
+$toolbarTitleFontSize: 19px;
35 35
 $toolbarBackground: rgba(0, 0, 0, 0.5);
36 36
 $toolbarSelectBackground: rgba(0, 0, 0, .6);
37 37
 $toolbarBadgeBackground: #165ECC;
@@ -94,7 +94,7 @@ $notificationWidth: 215px;
94 94
  */
95 95
 $borderRadius: 3px;
96 96
 $defaultWatermarkLink: '../images/watermark.png';
97
-$sidebarWidth: 200px;
97
+$sidebarWidth: 220px;
98 98
 
99 99
 $happySoftwareBackground: transparent;
100 100
 
@@ -119,11 +119,6 @@ $defaultDarkFontColor: #000;
119 119
 /**
120 120
  * Forms
121 121
  */
122
-//dropdown
123
-$selectFontColor: $defaultLightFontColor;
124
-$selectBg: $defaultBackground;
125
-$selectActiveBg: $defaultBackground;
126
-$selectActiveItemBg: $defaultDarkColor;
127 122
 //inputs
128 123
 $inputControlEmColor: #f29424;
129 124
 //buttons

+ 1
- 1
css/aui-components/dropdown.scss Bestand weergeven

@@ -1,6 +1,6 @@
1
-
2 1
 .select2-container.aui-select2-container {
3 2
     background-color: transparent !important;
3
+    margin-top: 2px;
4 4
 
5 5
     a.select2-choice {
6 6
         height: 28px !important;

+ 10
- 1
css/themes/_light.scss Bestand weergeven

@@ -74,4 +74,13 @@ $popoverFontColor: #ffffff;
74 74
 $popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
75 75
 
76 76
 // Toolbar
77
-$splitterColor: #ccc;
77
+$splitterColor: #ccc;
78
+
79
+/**
80
+ * Forms
81
+ */
82
+//dropdown
83
+$selectFontColor: $baseLight;
84
+$selectBg: $controlBackground;
85
+$selectActiveBg: darken($controlBackground, 5%);
86
+$selectActiveItemBg: darken($controlBackground, 10%);

Laden…
Annuleren
Opslaan