Skip to content

Commit

Permalink
csscomb
Browse files Browse the repository at this point in the history
  • Loading branch information
nosovsh committed Oct 3, 2015
1 parent 6faf004 commit 28ed3e8
Show file tree
Hide file tree
Showing 25 changed files with 202 additions and 146 deletions.
28 changes: 28 additions & 0 deletions .csscomb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"exclude": [
".git/**",
"node_modules/**",
"bower_components/**"
],
"always-semicolon": true,
"color-case": "upper",
"block-indent": " ",
"color-shorthand": false,
"element-case": "lower",
"eof-newline": true,
"leading-zero": true,
"quotes": "double",
"space-before-colon": "",
"space-after-colon": " ",
"space-before-combinator": " ",
"space-after-combinator": " ",
"space-between-declarations": "\n",
"space-before-opening-brace": " ",
"space-after-opening-brace": "\n",
"space-after-selector-delimiter": " ",
"space-before-selector-delimiter": "",
"space-before-closing-brace": "\n",
"strip-spaces": true,
"tab-size": 4,
"unitless-zero": true
}
2 changes: 1 addition & 1 deletion components/dump/Avatar/Avatar.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
.Avatar_size_small {
width: 38px;
height: 38px;
}
}
4 changes: 2 additions & 2 deletions components/dump/AvatarList/AvatarList.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
position: absolute;
left: 50%;
margin-left: -26px;
transition: all .5s ease;
}
transition: all 0.5s ease;
}
7 changes: 2 additions & 5 deletions components/dump/Button/Button.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,22 @@
display: inline-block;
padding: 9px 20px;
margin-right: 14px;

line-height: 22px;
cursor: pointer;

transition: all 0.2s ease;
}

@media only screen and (min-width : 768px) {
.Button:hover {
background-color: #4D4D4D;
color: #fff;
color: #FFFFFF;
}
}
.Button:active, .Button__selected {
background-color: #4D4D4D;
color: #fff;
color: #FFFFFF;
}

.Button:last-child {
margin-right: 0;
}

12 changes: 6 additions & 6 deletions components/dump/ButtonRow/ButtonRow.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
@media only screen and (min-width: 768px) {
.ButtonRow:hover {
background-color: #4D4D4D;
color: #fff;
color: #FFFFFF;
}
}

.ButtonRow:active, .ButtonRow__selected {
background-color: #4D4D4D;
color: #fff;
color: #FFFFFF;
}

.ButtonRow_color_light {
border-color: #c3c3c3;
border-color: #C3C3C3;
}

.ButtonRow_color_dark {
background: rgba(77, 77, 77, .76);
color: #FFF;
background: rgba(77, 77, 77, 0.76);
color: #FFFFFF;
}

.ButtonRow_height_thin {
Expand All @@ -51,4 +51,4 @@
.ButtonRow_align_left {
text-align: left;
padding-left: 8px;
}
}
2 changes: 1 addition & 1 deletion components/dump/Comments/Comment/Comment.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
.Comment__Date {
opacity: 0.7;
line-height: 1.7em;
}
}
2 changes: 1 addition & 1 deletion components/dump/Comments/CommentForm/CommentForm.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

.Comment__Textarea:focus {
color: #333;
color: #333333;
}

.Comment__Textarea-wrapper {
Expand Down
4 changes: 2 additions & 2 deletions components/dump/Controls/ControlButton/ControlButton.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
position: relative;
height: 38px;
padding: 0 16px;
color: #ffffff;
color: #FFFFFF;
background: rgba(77, 77, 77, 0.76);
text-decoration: none;
vertical-align: bottom;
Expand Down Expand Up @@ -34,4 +34,4 @@
width: 38px;
padding: 0;
margin-top: 10px;
}
}
8 changes: 4 additions & 4 deletions components/dump/DropDownMenu/DropDownMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
top: 100%;
left: 0;
width: 244px;
box-shadow: 0 2px 3px 1px rgba(0, 0, 0, .2);
box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.2);
background-color: transparent;
border-radius: 5px;
margin: 10px 0 0;
Expand All @@ -19,9 +19,9 @@
.PopoverArrow:after {
transform: rotate(45deg) translate(6px, 6px);
box-shadow: -1px -1px 1px -1px rgba(0, 0, 0, 0.44);
content: '';
content: "";
display: block;
width: 14px;
height: 14px;
background: rgba(77, 77, 77, .76);
}
background: rgba(77, 77, 77, 0.76);
}
4 changes: 2 additions & 2 deletions components/dump/EditLocation/EditLocation.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
transform: translate(-50%, 0);
border-radius: 15px;
margin-top: 20px;
background: #FFF;
background: #FFFFFF;
width: 332px;
z-index: 200;
}
}
131 changes: 82 additions & 49 deletions components/dump/Icon/Icon.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@font-face {
font-family: 'fontello';
src: url('font/fontello.eot');
src: url('font/fontello.eot#iefix') format('embedded-opentype'),
url('font/fontello.woff') format('woff'),
url('font/fontello.ttf') format('truetype'),
url('font/fontello.svg#fontello') format('svg');
font-weight: normal;
font-style: normal;
font-family: "fontello";
src: url("font/fontello.eot");
src: url("font/fontello.eot#iefix") format("embedded-opentype"),
url("font/fontello.woff") format("woff"),
url("font/fontello.ttf") format("truetype"),
url("font/fontello.svg#fontello") format("svg");
font-weight: normal;
font-style: normal;
}
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
Expand All @@ -19,51 +19,84 @@
}
*/

[class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
speak: none;
[class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: 0.2em;
text-align: center;
/* opacity: .8; */

display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
/* opacity: .8; */
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;

/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
/* fix buttons height, for twitter bootstrap */
line-height: 1em;

/* fix buttons height, for twitter bootstrap */
line-height: 1em;
/* Animation center compensation - margins should be symmetric */
/* remove if not needed */
margin-left: 0.2em;

/* Animation center compensation - margins should be symmetric */
/* remove if not needed */
margin-left: .2em;
/* you can be more comfortable with increased icons size */
/* font-size: 120%; */

/* you can be more comfortable with increased icons size */
/* font-size: 120%; */

/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}

.icon-user:before { content: '\e800'; } /* '' */
.icon-add:before { content: '\e801'; } /* '' */
.icon-menu:before { content: '\e802'; } /* '' */
.icon-rouble:before { content: '\e803'; } /* '' */
.icon-close:before { content: '\e804'; } /* '' */
.icon-edit:before { content: '\e805'; } /* '' */
.icon-resize:before { content: '\e806'; } /* '' */
.icon-rocket:before { content: '\e807'; } /* '' */
.icon-thumbup:before { content: '\e808'; } /* '' */
.icon-predator:before { content: '\e809'; } /* '' */
.icon-send:before { content: '\e80a'; } /* '' */
.icon-send1:before { content: '\e80b'; } /* '' */
.icon-add-image:before { content: '\e80c'; } /* '' */
.icon-location:before { content: '\e80d'; } /* '' */
.icon-plus:before { content: '\e80e'; } /* '' */
.icon-minus:before { content: '\e80f'; } /* '' */
.icon-delete:before { content: '\e810'; } /* '' */
.icon-user:before {
content: "\e800";
} /* '' */
.icon-add:before {
content: "\e801";
} /* '' */
.icon-menu:before {
content: "\e802";
} /* '' */
.icon-rouble:before {
content: "\e803";
} /* '' */
.icon-close:before {
content: "\e804";
} /* '' */
.icon-edit:before {
content: "\e805";
} /* '' */
.icon-resize:before {
content: "\e806";
} /* '' */
.icon-rocket:before {
content: "\e807";
} /* '' */
.icon-thumbup:before {
content: "\e808";
} /* '' */
.icon-predator:before {
content: "\e809";
} /* '' */
.icon-send:before {
content: "\e80a";
} /* '' */
.icon-send1:before {
content: "\e80b";
} /* '' */
.icon-add-image:before {
content: "\e80c";
} /* '' */
.icon-location:before {
content: "\e80d";
} /* '' */
.icon-plus:before {
content: "\e80e";
} /* '' */
.icon-minus:before {
content: "\e80f";
} /* '' */
.icon-delete:before {
content: "\e810";
} /* '' */
18 changes: 9 additions & 9 deletions components/dump/Icon/animation.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.animate-spin {
animation: spin 2s infinite linear;
display: inline-block;
animation: spin 2s infinite linear;
display: inline-block;
}
@keyframes spin {
0% {
transform: rotate(0deg);
}
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(359deg);
}
}
100% {
transform: rotate(359deg);
}
}
4 changes: 2 additions & 2 deletions components/dump/Modal/Modal.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.Modal__Content__Inner {
position: relative;
width: auto;
background: #FFF;
background: #FFFFFF;
z-index: 100;
}

Expand Down Expand Up @@ -89,7 +89,7 @@
.Modal__Header {
position: absolute;
top: -90px;
color: #FFF;
color: #FFFFFF;
font-weight: 200;
}

Expand Down
4 changes: 2 additions & 2 deletions components/dump/NewParking/NewParking.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
top: 35%;
transform: translate(-50%, 0);
border-radius: 5px;
background: #FFF;
background: #FFFFFF;
width: 332px;
z-index: 200;
}
Expand Down Expand Up @@ -77,4 +77,4 @@
.NewParking {
width: 100%;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
width: 100%;
height: 230px;
margin-top: 17px;

text-align: center;
line-height: 230px;
font-size: 2em; /* strange bug android chrome if >2em */
Expand All @@ -38,4 +37,4 @@
position: relative;
top: -100%;
color: #979797;
}
}
Loading

0 comments on commit 28ed3e8

Please sign in to comment.