rename zzz.css to zammad.css and move to scss

This commit is contained in:
Felix Niklas 2014-10-07 15:36:44 +02:00
parent e8a07ea037
commit 52faac6b31
2 changed files with 19 additions and 34 deletions

View file

@ -10,7 +10,7 @@
*= require ./bootstrap-tokenfield.css *= require ./bootstrap-tokenfield.css
*= require ./noty_theme_twitter.css *= require ./noty_theme_twitter.css
*= require ./sew.css *= require ./sew.css
*= require ./zzz.css *= require ./zammad.css.scss
*= require ./fonts/fira-sans.css *= require ./fonts/fira-sans.css
*= require ./layout.css *= require ./layout.css
* *

View file

@ -236,9 +236,7 @@ table {
.table th:not(.noTruncate), .table th:not(.noTruncate),
.table td:not(.noTruncate) { .table td:not(.noTruncate) {
overflow: hidden; @extend .u-textTruncate;
text-overflow: ellipsis;
white-space: nowrap;
} }
.table > thead:first-child > tr:first-child > th, .table > thead:first-child > tr:first-child > th,
@ -278,9 +276,7 @@ table {
padding: 0; padding: 0;
margin: 0; margin: 0;
height: 38px; height: 38px;
cursor: pointer; @extend .u-clickable;
-webkit-user-select: none;
user-select: none;
} }
.checkbox-replacement input[type=checkbox] { .checkbox-replacement input[type=checkbox] {
@ -333,10 +329,8 @@ table {
} }
#task .task { #task .task {
@extend .u-textTruncate;
max-width: 120px; max-width: 120px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block; display: inline-block;
} }
@ -647,7 +641,7 @@ textarea,
.subtle-link { .subtle-link {
color: rgba(0,0,0,.32); color: rgba(0,0,0,.32);
text-decoration: underline; text-decoration: underline;
cursor: pointer; @extend .u-clickable;
} }
.subtle-link:hover { .subtle-link:hover {
@ -684,8 +678,8 @@ ol.tabs li {
padding: 10px 20px; padding: 10px 20px;
text-align: center; text-align: center;
border-right: 1px solid rgba(0,8,14,.08); border-right: 1px solid rgba(0,8,14,.08);
cursor: pointer;
flex-grow: 1; flex-grow: 1;
@extend .u-clickable;
} }
.tab.active { .tab.active {
@ -762,8 +756,8 @@ ol.tabs li {
.auth_provider:hover { .auth_provider:hover {
color: white; color: white;
cursor: pointer;
text-decoration: none; text-decoration: none;
@extend .u-clickable;
} }
.auth_provider.facebook { .auth_provider.facebook {
@ -1414,9 +1408,7 @@ footer {
width: 50%; width: 50%;
} }
.customer_info ul.nav > li > a { .customer_info ul.nav > li > a {
text-overflow: ellipsis; @extend .u-textTruncate;
overflow: hidden;
white-space: nowrap;
} }
.customer_info .thumbnail { .customer_info .thumbnail {
position: absolute; position: absolute;
@ -1638,8 +1630,8 @@ footer {
.task { .task {
padding: 10px 15px 7px 0; padding: 10px 15px 7px 0;
cursor: pointer;
position: relative; position: relative;
@extend .u-clickable;
} }
.tasks-navigation .task { .tasks-navigation .task {
@ -1817,8 +1809,8 @@ footer {
height: 36px; height: 36px;
background: url(<%= asset_path "logo.svg" %>); background: url(<%= asset_path "logo.svg" %>);
transition: 240ms; transition: 240ms;
cursor: pointer;
position: relative; position: relative;
@extend .u-clickable;
} }
.logo .activity-counter { .logo .activity-counter {
@ -1905,8 +1897,9 @@ footer {
.user-menu .list-button { .user-menu .list-button {
height: 60px; height: 60px;
position: relative; position: relative;
cursor: pointer;
z-index: 1001; z-index: 1001;
text-decoration: none;
@extend .u-clickable;
} }
.user-menu .list-button *:not(.dropdown-nose) { .user-menu .list-button *:not(.dropdown-nose) {
@ -2081,9 +2074,7 @@ footer {
line-height: 39px; line-height: 39px;
border-radius: 0; border-radius: 0;
border-top: 1px solid #f2f2f3; border-top: 1px solid #f2f2f3;
text-overflow: ellipsis; @extend .u-textTruncate;
overflow: hidden;
white-space: nowrap;
} }
.nav-pills > li:hover > a { .nav-pills > li:hover > a {
@ -2709,9 +2700,7 @@ footer {
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
opacity: 0.5; opacity: 0.5;
cursor: pointer; @extend .u-clickable;
-webkit-user-select: none;
user-select: none;
} }
.article-action:hover { .article-action:hover {
@ -3125,9 +3114,9 @@ footer {
width: 56px; width: 56px;
height: 60px; height: 60px;
background: hsl(197,20%,93%); background: hsl(197,20%,93%);
cursor: pointer;
position: relative; position: relative;
border-top: 1px solid hsl(202,12%,87%); border-top: 1px solid hsl(202,12%,87%);
@extend .u-clickable;
} }
.tabsSidebar-tab.is-changed:before { .tabsSidebar-tab.is-changed:before {
@ -3440,9 +3429,7 @@ footer {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
cursor: pointer; @extend .u-clickable;
-webkit-user-select: none;
user-select: none;
} }
.modal-close .close.icon { .modal-close .close.icon {
@ -3660,7 +3647,7 @@ footer {
font-size: 13px; font-size: 13px;
color: inherit; color: inherit;
text-transform: inherit; text-transform: inherit;
cursor: pointer; @extend .u-clickable;
} }
.checkbox.form-group input[type=checkbox] { .checkbox.form-group input[type=checkbox] {
@ -3771,9 +3758,7 @@ footer {
.scrollPageHeader h1 { .scrollPageHeader h1 {
font-size: 19px; font-size: 19px;
margin: 0 15px; margin: 0 15px;
overflow: hidden; @extend .u-textTruncate;
text-overflow: ellipsis;
white-space: nowrap;
} }
.wizard { .wizard {
@ -3815,11 +3800,11 @@ footer {
} }
.import-source { .import-source {
cursor: pointer;
border-radius: 5px; border-radius: 5px;
border: 1px solid rgba(0,0,0,.13); border: 1px solid rgba(0,0,0,.13);
height: 50px; height: 50px;
margin: 5px 0; margin: 5px 0;
@extend .u-clickable;
} }
.input-feedback { .input-feedback {