Browse Source

work on colors

j8
Ilya Daynatovich 8 years ago
parent
commit
cbc6943305

+ 6
- 4
css/_contact_list.scss View File

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

+ 2
- 2
css/_side_toolbar_container.scss View File

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

+ 2
- 2
css/_toolbars.scss View File

252
  */
252
  */
253
 @include keyframes(slideInExt) {
253
 @include keyframes(slideInExt) {
254
     from { width: 0px; }
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
 .slideInExt {
258
 .slideInExt {
260
 }
260
 }
261
 
261
 
262
 @include keyframes(slideOutExt) {
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
   to   { width: 0px; }
264
   to   { width: 0px; }
265
 }
265
 }
266
 
266
 

+ 2
- 7
css/_variables.scss View File

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

+ 1
- 1
css/aui-components/dropdown.scss View File

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

+ 10
- 1
css/themes/_light.scss View File

74
 $popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
74
 $popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
75
 
75
 
76
 // Toolbar
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%);

Loading…
Cancel
Save