Fix style issues in the toolbar

pull/1/head
yflory 8 years ago
parent f9db7e588e
commit 4aed585574

@ -10,15 +10,16 @@
} }
.toolbar-container { .toolbar-container {
.cryptpad-lag {
position: relative;
top: -2px;
}
font: 12px Arial,Helvetica,Tahoma,Verdana,sans-serif; font: 12px Arial,Helvetica,Tahoma,Verdana,sans-serif;
background: -webkit-linear-gradient(#EEEEEE, #DADADA); /* For Safari 5.1 to 6.0 */ background: -webkit-linear-gradient(#EEEEEE, #DADADA); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(#f5f5f5, #DDDDDD); /* For Opera 11.1 to 12.0 */ background: -o-linear-gradient(#f5f5f5, #DDDDDD); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(#f5f5f5, #DDDDDD); /* For Firefox 3.6 to 15 */ background: -moz-linear-gradient(#f5f5f5, #DDDDDD); /* For Firefox 3.6 to 15 */
background: linear-gradient(#f5f5f5, #DDDDDD); /* Standard syntax */ background: linear-gradient(#f5f5f5, #DDDDDD); /* Standard syntax */
.cryptpad-toolbar {
select {
box-sizing: border-box;
}
}
} }
.cryptpad-toolbar { .cryptpad-toolbar {
@ -37,6 +38,17 @@
float: right; float: right;
} }
.cryptpad-lag {
vertical-align: top;
height: 16px;
width: 16px;
display: inline-block;
margin: 2px 0px;
padding: 5px;
div {
margin: auto;
}
}
div { div {
white-space: normal; white-space: normal;
&.cryptpad-back { &.cryptpad-back {
@ -45,11 +57,6 @@
cursor: pointer; cursor: pointer;
color: #000; color: #000;
} }
&.cryptpad-lag {
float: left;
line-height: 26px;
margin: 2px 0px;
}
} }
button, select, .rightside-element { button, select, .rightside-element {
@ -116,6 +123,11 @@
padding-left: 5px; padding-left: 5px;
border: 1px solid #A6A6A6; border: 1px solid #A6A6A6;
border-bottom-color: #979797; border-bottom-color: #979797;
vertical-align: top;
box-sizing: content-box;
option {
height: 24px;
}
} }
} }
@ -229,6 +241,9 @@
.cryptpad-user { .cryptpad-user {
position: absolute; position: absolute;
right: 0; right: 0;
span:not(.cryptpad-lag) {
vertical-align: top;
}
@media screen and (max-width: 400px) { @media screen and (max-width: 400px) {
top: 3em; top: 3em;
} }
@ -276,9 +291,11 @@
padding: 5px 0px; padding: 5px 0px;
margin: 5px 0px; margin: 5px 0px;
font-size: 16px; font-size: 16px;
white-space: normal;
} }
} }
button { button {
white-space: normal;
margin: 2px 0px; margin: 2px 0px;
} }
} }
@ -295,7 +312,7 @@
//float: right; //float: right;
} }
.cryptpad-spinner { .cryptpad-spinner {
float: left; //float: left;
display: inline-block; display: inline-block;
height: 26px; height: 26px;
margin: 2px; margin: 2px;
@ -310,10 +327,6 @@
.cryptpad-toolbar-username { .cryptpad-toolbar-username {
} }
.lag { .lag {
display: inline-block;
vertical-align: middle;
padding: 0 !important;
margin: 0 5px !important;
height: 15px !important; height: 15px !important;
width: 15px !important; width: 15px !important;
border-radius: 50%; border-radius: 50%;

@ -17,9 +17,8 @@
background: linear-gradient(#f5f5f5, #DDDDDD); background: linear-gradient(#f5f5f5, #DDDDDD);
/* Standard syntax */ /* Standard syntax */
} }
.toolbar-container .cryptpad-lag { .toolbar-container .cryptpad-toolbar select {
position: relative; box-sizing: border-box;
top: -2px;
} }
.cryptpad-toolbar { .cryptpad-toolbar {
box-sizing: border-box; box-sizing: border-box;
@ -39,6 +38,17 @@
.cryptpad-toolbar a { .cryptpad-toolbar a {
float: right; float: right;
} }
.cryptpad-toolbar .cryptpad-lag {
vertical-align: top;
height: 16px;
width: 16px;
display: inline-block;
margin: 2px 0px;
padding: 5px;
}
.cryptpad-toolbar .cryptpad-lag div {
margin: auto;
}
.cryptpad-toolbar div { .cryptpad-toolbar div {
white-space: normal; white-space: normal;
} }
@ -48,11 +58,6 @@
cursor: pointer; cursor: pointer;
color: #000; color: #000;
} }
.cryptpad-toolbar div.cryptpad-lag {
float: left;
line-height: 26px;
margin: 2px 0px;
}
.cryptpad-toolbar button, .cryptpad-toolbar button,
.cryptpad-toolbar select, .cryptpad-toolbar select,
.cryptpad-toolbar .rightside-element { .cryptpad-toolbar .rightside-element {
@ -118,6 +123,11 @@
padding-left: 5px; padding-left: 5px;
border: 1px solid #A6A6A6; border: 1px solid #A6A6A6;
border-bottom-color: #979797; border-bottom-color: #979797;
vertical-align: top;
box-sizing: content-box;
}
.cryptpad-toolbar select option {
height: 24px;
} }
.cryptpad-toolbar-top { .cryptpad-toolbar-top {
display: block; display: block;
@ -234,6 +244,9 @@
position: absolute; position: absolute;
right: 0; right: 0;
} }
.cryptpad-toolbar-top .cryptpad-user span:not(.cryptpad-lag) {
vertical-align: top;
}
@media screen and (max-width: 400px) { @media screen and (max-width: 400px) {
.cryptpad-toolbar-top .cryptpad-user { .cryptpad-toolbar-top .cryptpad-user {
top: 3em; top: 3em;
@ -289,8 +302,10 @@
padding: 5px 0px; padding: 5px 0px;
margin: 5px 0px; margin: 5px 0px;
font-size: 16px; font-size: 16px;
white-space: normal;
} }
.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown button { .cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown button {
white-space: normal;
margin: 2px 0px; margin: 2px 0px;
} }
.cryptpad-toolbar-leftside button { .cryptpad-toolbar-leftside button {
@ -303,7 +318,6 @@
text-align: right; text-align: right;
} }
.cryptpad-spinner { .cryptpad-spinner {
float: left;
display: inline-block; display: inline-block;
height: 26px; height: 26px;
margin: 2px; margin: 2px;
@ -316,10 +330,6 @@
text-transform: uppercase; text-transform: uppercase;
} }
.lag { .lag {
display: inline-block;
vertical-align: middle;
padding: 0 !important;
margin: 0 5px !important;
height: 15px !important; height: 15px !important;
width: 15px !important; width: 15px !important;
border-radius: 50%; border-radius: 50%;

@ -84,7 +84,7 @@ define([
id: uid(), id: uid(),
'class': SPINNER_CLS, 'class': SPINNER_CLS,
}); });
$container.append($spinner); $container.prepend($spinner);
return $spinner[0]; return $spinner[0];
}; };

@ -15,6 +15,7 @@
} }
#cke_1_top .cryptpad-toolbar { #cke_1_top .cryptpad-toolbar {
margin-bottom: 1px; margin-bottom: 1px;
padding: 0px;
} }
</style> </style>
</head> </head>

Loading…
Cancel
Save