pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge commit 'bf50211617521c87da851b3f663dac8afc691f49' into theurere-sass-libs-branch 

Conflicts:
	src/styles/global/_base.scss
	src/styles/main.scss

Merge. Did not keep changes from:

    src/styles/color-pallete.html
    src/styles/global/_angular.scss
    src/styles/global/_animations.scss
    src/styles/global/_nicescroll.scss
    src/styles/global/_overlaybar.scss

Added a variable to src/styles/global/_variables.scss
pull/29/head
Evan Theurer 12 years ago
parent
7ddc562c4d bf50211617
commit
5fa3690b46
7 changed files with 392 additions and 303 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      html/main.html
  2. 224
      src/styles/components/_bar.scss
  3. 187
      src/styles/global/_base.scss
  4. 34
      src/styles/global/_mixins.scss
  5. 6
      src/styles/global/_variables.scss
  6. 200
      static/css/bootstrap.min.css
  7. 20
      static/css/font-awesome.min.css

22
html/main.html
Unescape View File

@ -8,16 +8,18 @@ @@ -8,16 +8,18 @@
<div id="loader"><div><i class="fa fa-spinner fa-spin"></i></div></div>
<page></page>
<div id="bar">
<div class="left">
<%template "logo" .%>
</div>
<status-message></status-message>
<div class="ng-cloak right">
<button title="{{_('Share your screen')}}" class="btn aenablebtn" ng-show="isChrome && webrtcDetectedVersion >= 32 && (status=='connected' || status=='conference' || layout.screenshare)" ng-model="layout.screenshare" btn-checkbox><i class="fa fa-desktop"></i></button>
<button title="{{_('Chat')}}" ng-show="roomstatus" class="btn" ng-class="{messagesunseen: chatMessagesUnseen>0}" ng-model="layout.chat" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-comments-o"></i><span class="badge" ng-show="chatMessagesUnseen">{{chatMessagesUnseen}}</span></button>
<button title="{{_('Mute microphone')}}" class="btn amutebtn" ng-model="microphoneMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-microphone-slash"></i></button>
<button title="{{_('Turn camera off')}}" class="btn amutebtn" ng-model="cameraMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-eye-slash"></i></button>
<button title="{{_('Settings')}}" class="btn" ng-model="layout.settings" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-cog"></i></button>
<div class="bar">
<div class="left">
<%template "logo" .%>
</div>
<status-message></status-message>
<div class="ng-cloak right">
<button title="{{_('Share your screen')}}" class="btn aenablebtn" ng-show="isChrome && webrtcDetectedVersion >= 32 && (status=='connected' || status=='conference' || layout.screenshare)" ng-model="layout.screenshare" btn-checkbox><i class="fa fa-desktop"></i></button>
<button title="{{_('Chat')}}" ng-show="roomstatus" class="btn" ng-class="{messagesunseen: chatMessagesUnseen>0}" ng-model="layout.chat" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-comments-o"></i><span class="badge" ng-show="chatMessagesUnseen">{{chatMessagesUnseen}}</span></button>
<button title="{{_('Mute microphone')}}" class="btn amutebtn" ng-model="microphoneMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-microphone-slash"></i></button>
<button title="{{_('Turn camera off')}}" class="btn amutebtn" ng-model="cameraMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-eye-slash"></i></button>
<button title="{{_('Settings')}}" class="btn" ng-model="layout.settings" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-cog"></i></button>
</div>
</div>
</div>
<div id="roombar" class="ng-cloak">

224
src/styles/components/_bar.scss
Unescape View File

@ -20,109 +20,78 @@ @@ -20,109 +20,78 @@
*/
#bar {
background-color: $componentbg;
color: $componentfg1;
font: bold 1em/40px $font-sans-serif;
left: 0;
min-height: 44px;
position: absolute;
right: 0;
top: 0;
text-align: center;
z-index: 5;
}
.bar {
background-color: $componentbg;
color: $componentfg1;
font: bold 1em/40px $font-sans-serif;
text-align: center;
// @include adjust-leading-to(2);
@include box-shadow(0 2px 10px 0 $componentfg3);
// @include debug-vertical-alignment();
@include touch-callout(none);
@include user-select(none);
> .left {
bottom: 0;
left: 0;
top: 0;
padding-left: 12px;
position: absolute;
// TODO(theurere): cleanup
> *, #bar > .right > * {
vertical-align: middle;
}
@include breakpt($breakpoint-medium) {
z-index: 40;
@include box-shadow(none);
}
.btn {
position: relative;
}
}
.bar .left {
bottom: 0;
left: 0;
top: 0;
padding-left: 12px;
position: absolute;
.logo {
background: url(../img/logo-small.png) no-repeat;
background-size: 100%;
display: inline-block;
color: black;
font: normal 11px/11px $font-sans-serif;
height: 32px;
font: normal 11px/11px $font-sans-serif;
text-align: left;
width: 90px;
> span {
vertical-align: middle;
// @include adjust-font-size-to(11px,0.4);
span {
font-style: italic;
left: 38px;
position: relative;
top: 26px;
}
> span a {
span a {
color: $dgrey;
}
}
}
#bar {
> .right {
bottom: 1px;
padding-right: 8px;
position: absolute;
right: 0;
top: 1px;
.btn {
background: transparent;
border-color: transparent;
color: $grey3;
display: inline-block;
font: 24px/40px $font-sans-serif;
height: 42px;
margin-left: -4px;
padding: 0;
text-align: center;
width: 42px;
}
.btn:focus {
border: none;
@include box-shadow(0);
outline: none;
}
.btn:hover {
background-color: none;
border-color: #ccc;
color: $grey4;
}
.btn.active {
background-color: none;
border-color: #ccc;
color: $grey4;
}
.btn.active.amutebtn {
background-color: $red;
border-color: $red;
color: white;
}
.btn.active.aenablebtn {
background-color: $actioncolor1;
border-color: $actioncolor1;
color: white;
}
}
}
#bar {
.btn {
position: relative;
}
.badge {
background-color: $actioncolor1;
border: 1px solid white;
font-size: .4em;
position: absolute;
right: 0;
top: 2px;
.bar .middle {
background-color: $componentbg;
display: inline-block;
font-weight: bold;
min-height: 44px;
padding: 0 1em;
position: relative;
margin-left: -70px;
z-index: 5;
@include breakpt($breakpoint-medium) {
display: block;
margin-left: 0px;
max-width: 40%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.userpicture {
border-radius: 2px;
@ -131,38 +100,13 @@ @@ -131,38 +100,13 @@
margin: -5px .5em 0 .5em;
width: 46px;
}
> .middle {
background-color: $componentbg;
display: inline-block;
min-height: 44px;
padding: 0 1em;
position: relative;
margin-left: -70px;
vertical-align: middle;
z-index: 5;
@include breakpt($breakpoint-medium) {
display: block;
margin-left: 0px;
max-width: 40%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
#bar {
@include breakpt($breakpoint-medium) {
z-index: 40;
@include box-shadow(none);
}
> .middle img {
img {
@include breakpt($breakpoint-medium) {
display: none;
}
}
> .middle.status-connected,
> .middle.status-conference {
&.status-connected,
&.status-conference {
@include breakpt($breakpoint-medium) {
max-width: 100%;
left: 0;
@ -170,11 +114,11 @@ @@ -170,11 +114,11 @@
right: 0;
}
}
> .middle.status-connecting,
> .middle.status-closed,
> .middle.status-reconnecting,
> .middle.status-error,
> .middle.status-ringing {
&.status-connecting,
&.status-closed,
&.status-reconnecting,
&.status-error,
&.status-ringing {
@include breakpt($breakpoint-medium) {
border-bottom: 1px solid $bordercolor;
max-width: 100%;
@ -182,14 +126,68 @@ @@ -182,14 +126,68 @@
}
}
// TODO(theurere): cleanup
> .middle.status-connecting .actions,
> .middle.status-closed .actions,
> .middle.status-reconnecting .actions,
> .middle.status-error .actions,
> .middle.status-ringing .actions {
&.status-connecting .actions,
&.status-closed .actions,
&.status-reconnecting .actions,
&.status-error .actions,
&.status-ringing .actions {
@include breakpt($breakpoint-medium) {
display: block;
padding: .2em 0 .8em 0;
}
}
}
.bar .right {
bottom: 1px;
padding-right: 8px;
position: absolute;
right: 0;
top: 1px;
.badge {
background-color: $actioncolor1;
border: 1px solid white;
font-size: .4em;
position: absolute;
right: 0;
top: 2px;
}
.btn {
background: transparent;
border-color: transparent;
color: $grey3;
display: inline-block;
height: 42px;
font: 24px/40px $font-sans-serif;
margin-left: -4px;
padding: 0;
text-align: center;
width: 42px;
// @include adjust-font-size-to(24px);
&:focus {
border: none;
outline: none;
@include box-shadow(0);
}
&:hover {
background-color: none;
border-color: #ccc;
color: $grey4;
}
&.active {
background-color: none;
border-color: #ccc;
color: $grey4;
}
&.active.amutebtn {
background-color: $red;
border-color: $red;
color: white;
}
&.active.aenablebtn {
background-color: $actioncolor1;
border-color: $actioncolor1;
color: white;
}
}
}

187
src/styles/global/_base.scss
View File

File diff suppressed because one or more lines are too long

34
src/styles/global/_mixins.scss
Unescape View File

@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
-khtml-user-select: $select;
-moz-user-select: $select;
-ms-user-select: $select;
-o-user-select: $select;
-webkit-user-select: $select;
user-select: $select;
}
@ -21,3 +22,36 @@ @@ -21,3 +22,36 @@
-webkit-box-shadow: $shadow;
box-shadow: $shadow;
}
@mixin transition-property($property) {
transition-property: $property;
-webkit-transition-property: $property;
}
@mixin transition-duration($duration) {
transition-duration: $duration;
-webkit-transition-duration: $duration;
}
@mixin transition($transition) {
transition: $transition;
-moz-transition: $transition;
-o-transition: $transition;
-webkit-transition: $transition;
}
@mixin border-radius($radius) {
border-radius: $radius;
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
}
@mixin linear-gradient($gradient...) {
background: #9dd53a; /* Old browsers */
background: linear-gradient(to bottom, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */
background: -o-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* IE10+ */
background: -moz-linear-gradient(top, #9dd53a 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Chrome10+,Safari5.1+ */
}

6
src/styles/global/_variables.scss
Unescape View File

@ -29,6 +29,9 @@ $bordercolor: #ccc; @@ -29,6 +29,9 @@ $bordercolor: #ccc;
$actioncolor1: rgb(132,184,25);
$actioncolor2: rgb(0,149,52);
$light-text: #aaa;
$lighter-text: #ddd;
$grey3: rgba(0,0,0,.3);
$grey4: rgba(0,0,0,.4);
$dgrey: rgb(34,34,34);
@ -40,3 +43,6 @@ $breakpoint-large: 1280px; @@ -40,3 +43,6 @@ $breakpoint-large: 1280px;
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif;
$base-font-size: 13px;
$base-line-height: 19px;
$audiovideolevel: $actioncolor1;

200
static/css/bootstrap.min.css vendored
Unescape View File

@ -1,3 +1,23 @@ @@ -1,3 +1,23 @@
/*
* Spreed Speak Freely.
* Copyright (C) 2013-2014 struktur AG
*
* This file is part of Spreed Speak Freely.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
/*
* Bootstrap v3.1.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
@ -269,10 +289,10 @@ html { @@ -269,10 +289,10 @@ html {
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-size: 14px;
line-height: 1.42857;
color: #333333;
background-color: #e5e5e5; }
background-color: white; }
input,
button,
@ -310,7 +330,7 @@ img { @@ -310,7 +330,7 @@ img {
.img-thumbnail {
padding: 4px;
line-height: 1.42857;
background-color: #e5e5e5;
background-color: white;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
@ -323,8 +343,8 @@ img { @@ -323,8 +343,8 @@ img {
border-radius: 50%; }
hr {
margin-top: 18px;
margin-bottom: 18px;
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eeeeee; }
@ -365,8 +385,8 @@ h1, h2, h3, h4, h5, h6, @@ -365,8 +385,8 @@ h1, h2, h3, h4, h5, h6,
h1, .h1,
h2, .h2,
h3, .h3 {
margin-top: 18px;
margin-bottom: 9px; }
margin-top: 20px;
margin-bottom: 10px; }
h1 small,
h1 .small, .h1 small,
.h1 .small,
@ -381,8 +401,8 @@ h3, .h3 { @@ -381,8 +401,8 @@ h3, .h3 {
h4, .h4,
h5, .h5,
h6, .h6 {
margin-top: 9px;
margin-bottom: 9px; }
margin-top: 10px;
margin-bottom: 10px; }
h4 small,
h4 .small, .h4 small,
.h4 .small,
@ -395,34 +415,34 @@ h6, .h6 { @@ -395,34 +415,34 @@ h6, .h6 {
font-size: 75%; }
h1, .h1 {
font-size: 33px; }
font-size: 36px; }
h2, .h2 {
font-size: 27px; }
font-size: 30px; }
h3, .h3 {
font-size: 23px; }
font-size: 24px; }
h4, .h4 {
font-size: 17px; }
font-size: 18px; }
h5, .h5 {
font-size: 13px; }
font-size: 14px; }
h6, .h6 {
font-size: 12px; }
p {
margin: 0 0 9px; }
margin: 0 0 10px; }
.lead {
margin-bottom: 18px;
font-size: 14px;
margin-bottom: 20px;
font-size: 16px;
font-weight: 200;
line-height: 1.4; }
@media (min-width: 768px) {
.lead {
font-size: 19.5px; } }
font-size: 21px; } }
small,
.small {
@ -510,14 +530,14 @@ a.bg-danger:hover { @@ -510,14 +530,14 @@ a.bg-danger:hover {
background-color: #e4b9b9; }
.page-header {
padding-bottom: 8px;
margin: 36px 0 18px;
padding-bottom: 9px;
margin: 40px 0 20px;
border-bottom: 1px solid #eeeeee; }
ul,
ol {
margin-top: 0;
margin-bottom: 9px; }
margin-bottom: 10px; }
ul ul,
ul ol,
ol ul,
@ -537,7 +557,7 @@ ol { @@ -537,7 +557,7 @@ ol {
dl {
margin-top: 0;
margin-bottom: 18px; }
margin-bottom: 20px; }
dt,
dd {
@ -575,9 +595,9 @@ abbr[data-original-title] { @@ -575,9 +595,9 @@ abbr[data-original-title] {
text-transform: uppercase; }
blockquote {
padding: 9px 18px;
margin: 0 0 18px;
font-size: 16.25px;
padding: 10px 20px;
margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #eeeeee; }
blockquote p:last-child,
blockquote ul:last-child,
@ -622,7 +642,7 @@ blockquote:after { @@ -622,7 +642,7 @@ blockquote:after {
content: ""; }
address {
margin-bottom: 18px;
margin-bottom: 20px;
font-style: normal;
line-height: 1.42857; }
@ -650,9 +670,9 @@ kbd { @@ -650,9 +670,9 @@ kbd {
pre {
display: block;
padding: 8.5px;
margin: 0 0 9px;
font-size: 12px;
padding: 9.5px;
margin: 0 0 10px;
font-size: 13px;
line-height: 1.42857;
word-break: break-all;
word-wrap: break-word;
@ -1351,7 +1371,7 @@ th { @@ -1351,7 +1371,7 @@ th {
.table {
width: 100%;
margin-bottom: 18px; }
margin-bottom: 20px; }
.table > thead > tr > th,
.table > thead > tr > td,
.table > tbody > tr > th,
@ -1375,7 +1395,7 @@ th { @@ -1375,7 +1395,7 @@ th {
.table > tbody + tbody {
border-top: 2px solid #dddddd; }
.table .table {
background-color: #e5e5e5; }
background-color: white; }
.table-condensed > thead > tr > th,
.table-condensed > thead > tr > td,
@ -1500,7 +1520,7 @@ table th[class*="col-"] { @@ -1500,7 +1520,7 @@ table th[class*="col-"] {
@media (max-width: 767px) {
.table-responsive {
width: 100%;
margin-bottom: 13.5px;
margin-bottom: 15px;
overflow-y: hidden;
overflow-x: scroll;
-ms-overflow-style: -ms-autohiding-scrollbar;
@ -1546,8 +1566,8 @@ legend { @@ -1546,8 +1566,8 @@ legend {
display: block;
width: 100%;
padding: 0;
margin-bottom: 18px;
font-size: 19.5px;
margin-bottom: 20px;
font-size: 21px;
line-height: inherit;
color: #333333;
border: 0;
@ -1591,16 +1611,16 @@ input[type="checkbox"]:focus { @@ -1591,16 +1611,16 @@ input[type="checkbox"]:focus {
output {
display: block;
padding-top: 7px;
font-size: 13px;
font-size: 14px;
line-height: 1.42857;
color: #555555; }
.form-control {
display: block;
width: 100%;
height: 32px;
height: 34px;
padding: 6px 12px;
font-size: 13px;
font-size: 14px;
line-height: 1.42857;
color: #555555;
background-color: white;
@ -1635,7 +1655,7 @@ input[type="search"] { @@ -1635,7 +1655,7 @@ input[type="search"] {
-webkit-appearance: none; }
input[type="date"] {
line-height: 32px; }
line-height: 34px; }
.form-group {
margin-bottom: 15px; }
@ -1643,7 +1663,7 @@ input[type="date"] { @@ -1643,7 +1663,7 @@ input[type="date"] {
.radio,
.checkbox {
display: block;
min-height: 18px;
min-height: 20px;
margin-top: 10px;
margin-bottom: 10px;
padding-left: 20px; }
@ -1718,17 +1738,17 @@ select[multiple].input-sm, @@ -1718,17 +1738,17 @@ select[multiple].input-sm,
.input-lg, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 45px;
height: 46px;
padding: 10px 16px;
font-size: 17px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px; }
select.input-lg, .input-group-lg > select.form-control,
.input-group-lg > select.input-group-addon,
.input-group-lg > .input-group-btn > select.btn {
height: 45px;
line-height: 45px; }
height: 46px;
line-height: 46px; }
textarea.input-lg, .input-group-lg > textarea.form-control,
.input-group-lg > textarea.input-group-addon,
@ -1742,15 +1762,15 @@ select[multiple].input-lg, @@ -1742,15 +1762,15 @@ select[multiple].input-lg,
.has-feedback {
position: relative; }
.has-feedback .form-control {
padding-right: 40px; }
padding-right: 42.5px; }
.has-feedback .form-control-feedback {
position: absolute;
top: 23px;
top: 25px;
right: 0;
display: block;
width: 32px;
height: 32px;
line-height: 32px;
width: 34px;
height: 34px;
line-height: 34px;
text-align: center; }
.has-success .help-block,
@ -1868,7 +1888,7 @@ select[multiple].input-lg, @@ -1868,7 +1888,7 @@ select[multiple].input-lg,
padding-top: 7px; }
.form-horizontal .radio,
.form-horizontal .checkbox {
min-height: 25px; }
min-height: 27px; }
.form-horizontal .form-group {
margin-left: -15px;
margin-right: -15px; }
@ -1897,7 +1917,7 @@ select[multiple].input-lg, @@ -1897,7 +1917,7 @@ select[multiple].input-lg,
border: 1px solid transparent;
white-space: nowrap;
padding: 6px 12px;
font-size: 13px;
font-size: 14px;
line-height: 1.42857;
border-radius: 4px;
-webkit-user-select: none;
@ -2083,7 +2103,7 @@ select[multiple].input-lg, @@ -2083,7 +2103,7 @@ select[multiple].input-lg,
.btn-lg, .btn-group-lg > .btn {
padding: 10px 16px;
font-size: 17px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px; }
@ -2775,7 +2795,7 @@ input[type="button"].btn-block { @@ -2775,7 +2795,7 @@ input[type="button"].btn-block {
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
font-size: 13px;
font-size: 14px;
background-color: white;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
@ -2788,7 +2808,7 @@ input[type="button"].btn-block { @@ -2788,7 +2808,7 @@ input[type="button"].btn-block {
left: auto; }
.dropdown-menu .divider {
height: 1px;
margin: 8px 0;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5; }
.dropdown-menu > li > a {
@ -3062,7 +3082,7 @@ input[type="button"].btn-block { @@ -3062,7 +3082,7 @@ input[type="button"].btn-block {
.input-group-addon {
padding: 6px 12px;
font-size: 13px;
font-size: 14px;
font-weight: normal;
line-height: 1;
color: #555555;
@ -3080,7 +3100,7 @@ input[type="button"].btn-block { @@ -3080,7 +3100,7 @@ input[type="button"].btn-block {
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn {
padding: 10px 16px;
font-size: 17px;
font-size: 18px;
border-radius: 6px; }
.input-group-addon input[type="radio"],
.input-group-addon input[type="checkbox"] {
@ -3160,7 +3180,7 @@ input[type="button"].btn-block { @@ -3160,7 +3180,7 @@ input[type="button"].btn-block {
border-color: #428bca; }
.nav .nav-divider {
height: 1px;
margin: 8px 0;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5; }
.nav > li > a > img {
@ -3180,7 +3200,7 @@ input[type="button"].btn-block { @@ -3180,7 +3200,7 @@ input[type="button"].btn-block {
border-color: #eeeeee #eeeeee #dddddd; }
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
color: #555555;
background-color: #e5e5e5;
background-color: white;
border: 1px solid #dddddd;
border-bottom-color: transparent;
cursor: default; }
@ -3238,7 +3258,7 @@ input[type="button"].btn-block { @@ -3238,7 +3258,7 @@ input[type="button"].btn-block {
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs-justified > .active > a:focus,
.nav-tabs.nav-justified > .active > a:focus {
border-bottom-color: #e5e5e5; } }
border-bottom-color: white; } }
.tab-content > .tab-pane {
display: none; }
@ -3253,7 +3273,7 @@ input[type="button"].btn-block { @@ -3253,7 +3273,7 @@ input[type="button"].btn-block {
.navbar {
position: relative;
min-height: 50px;
margin-bottom: 18px;
margin-bottom: 20px;
border: 1px solid transparent; }
.navbar:before, .navbar:after {
content: " ";
@ -3347,9 +3367,9 @@ input[type="button"].btn-block { @@ -3347,9 +3367,9 @@ input[type="button"].btn-block {
.navbar-brand {
float: left;
padding: 16px 15px;
font-size: 17px;
line-height: 18px;
padding: 15px 15px;
font-size: 18px;
line-height: 20px;
height: 50px; }
.navbar-brand:hover, .navbar-brand:focus {
text-decoration: none; }
@ -3382,11 +3402,11 @@ input[type="button"].btn-block { @@ -3382,11 +3402,11 @@ input[type="button"].btn-block {
display: none; } }
.navbar-nav {
margin: 8px -15px; }
margin: 7.5px -15px; }
.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
line-height: 18px; }
line-height: 20px; }
@media (max-width: 767px) {
.navbar-nav .open .dropdown-menu {
position: static;
@ -3400,7 +3420,7 @@ input[type="button"].btn-block { @@ -3400,7 +3420,7 @@ input[type="button"].btn-block {
.navbar-nav .open .dropdown-menu .dropdown-header {
padding: 5px 15px 5px 25px; }
.navbar-nav .open .dropdown-menu > li > a {
line-height: 18px; }
line-height: 20px; }
.navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus {
background-image: none; } }
@media (min-width: 768px) {
@ -3410,8 +3430,8 @@ input[type="button"].btn-block { @@ -3410,8 +3430,8 @@ input[type="button"].btn-block {
.navbar-nav > li {
float: left; }
.navbar-nav > li > a {
padding-top: 16px;
padding-bottom: 16px; }
padding-top: 15px;
padding-bottom: 15px; }
.navbar-nav.navbar-right:last-child {
margin-right: -15px; } }
@ -3429,8 +3449,8 @@ input[type="button"].btn-block { @@ -3429,8 +3449,8 @@ input[type="button"].btn-block {
border-bottom: 1px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
margin-top: 9px;
margin-bottom: 9px; }
margin-top: 8px;
margin-bottom: 8px; }
@media (max-width: 767px) {
.navbar-form .form-group {
margin-bottom: 5px; } }
@ -3457,8 +3477,8 @@ input[type="button"].btn-block { @@ -3457,8 +3477,8 @@ input[type="button"].btn-block {
border-bottom-left-radius: 0; }
.navbar-btn {
margin-top: 9px;
margin-bottom: 9px; }
margin-top: 8px;
margin-bottom: 8px; }
.navbar-btn.btn-sm, .btn-group-sm > .navbar-btn.btn {
margin-top: 10px;
margin-bottom: 10px; }
@ -3467,8 +3487,8 @@ input[type="button"].btn-block { @@ -3467,8 +3487,8 @@ input[type="button"].btn-block {
margin-bottom: 14px; }
.navbar-text {
margin-top: 16px;
margin-bottom: 16px; }
margin-top: 15px;
margin-bottom: 15px; }
@media (min-width: 768px) {
.navbar-text {
float: left;
@ -3583,7 +3603,7 @@ input[type="button"].btn-block { @@ -3583,7 +3603,7 @@ input[type="button"].btn-block {
.breadcrumb {
padding: 8px 15px;
margin-bottom: 18px;
margin-bottom: 20px;
list-style: none;
background-color: whitesmoke;
border-radius: 4px; }
@ -3599,7 +3619,7 @@ input[type="button"].btn-block { @@ -3599,7 +3619,7 @@ input[type="button"].btn-block {
.pagination {
display: inline-block;
padding-left: 0;
margin: 18px 0;
margin: 20px 0;
border-radius: 4px; }
.pagination > li {
display: inline; }
@ -3652,7 +3672,7 @@ input[type="button"].btn-block { @@ -3652,7 +3672,7 @@ input[type="button"].btn-block {
.pagination-lg > li > a,
.pagination-lg > li > span {
padding: 10px 16px;
font-size: 17px; }
font-size: 18px; }
.pagination-lg > li:first-child > a,
.pagination-lg > li:first-child > span {
border-bottom-left-radius: 6px;
@ -3677,7 +3697,7 @@ input[type="button"].btn-block { @@ -3677,7 +3697,7 @@ input[type="button"].btn-block {
.pager {
padding-left: 0;
margin: 18px 0;
margin: 20px 0;
list-style: none;
text-align: center; }
.pager:before, .pager:after {
@ -3808,7 +3828,7 @@ a.list-group-item.active > .badge, @@ -3808,7 +3828,7 @@ a.list-group-item.active > .badge,
color: inherit; }
.jumbotron p {
margin-bottom: 15px;
font-size: 20px;
font-size: 21px;
font-weight: 200; }
.container .jumbotron {
border-radius: 6px; }
@ -3823,14 +3843,14 @@ a.list-group-item.active > .badge, @@ -3823,14 +3843,14 @@ a.list-group-item.active > .badge,
padding-right: 60px; }
.jumbotron h1,
.jumbotron .h1 {
font-size: 58.5px; } }
font-size: 63px; } }
.thumbnail {
display: block;
padding: 4px;
margin-bottom: 18px;
margin-bottom: 20px;
line-height: 1.42857;
background-color: #e5e5e5;
background-color: white;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
@ -3853,7 +3873,7 @@ a.thumbnail.active { @@ -3853,7 +3873,7 @@ a.thumbnail.active {
.alert {
padding: 15px;
margin-bottom: 18px;
margin-bottom: 20px;
border: 1px solid transparent;
border-radius: 4px; }
.alert h4 {
@ -3927,8 +3947,8 @@ a.thumbnail.active { @@ -3927,8 +3947,8 @@ a.thumbnail.active {
.progress {
overflow: hidden;
height: 18px;
margin-bottom: 18px;
height: 20px;
margin-bottom: 20px;
background-color: whitesmoke;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
@ -3939,7 +3959,7 @@ a.thumbnail.active { @@ -3939,7 +3959,7 @@ a.thumbnail.active {
width: 0%;
height: 100%;
font-size: 12px;
line-height: 18px;
line-height: 20px;
color: white;
text-align: center;
background-color: #428bca;
@ -4121,7 +4141,7 @@ a.list-group-item-danger { @@ -4121,7 +4141,7 @@ a.list-group-item-danger {
line-height: 1.3; }
.panel {
margin-bottom: 18px;
margin-bottom: 20px;
background-color: white;
border: 1px solid transparent;
border-radius: 4px;
@ -4147,7 +4167,7 @@ a.list-group-item-danger { @@ -4147,7 +4167,7 @@ a.list-group-item-danger {
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: 15px;
font-size: 16px;
color: inherit; }
.panel-title > a {
color: inherit; }
@ -4281,7 +4301,7 @@ a.list-group-item-danger { @@ -4281,7 +4301,7 @@ a.list-group-item-danger {
margin-bottom: 0; }
.panel-group {
margin-bottom: 18px; }
margin-bottom: 20px; }
.panel-group .panel {
margin-bottom: 0;
border-radius: 4px;
@ -4386,7 +4406,7 @@ a.list-group-item-danger { @@ -4386,7 +4406,7 @@ a.list-group-item-danger {
.close {
float: right;
font-size: 19.5px;
font-size: 21px;
font-weight: bold;
line-height: 1;
color: black;
@ -4629,7 +4649,7 @@ button.close { @@ -4629,7 +4649,7 @@ button.close {
.popover-title {
margin: 0;
padding: 8px 14px;
font-size: 13px;
font-size: 14px;
font-weight: normal;
line-height: 18px;
background-color: #f7f7f7;

20
static/css/font-awesome.min.css vendored
Unescape View File

@ -1,3 +1,23 @@ @@ -1,3 +1,23 @@
/*
* Spreed Speak Freely.
* Copyright (C) 2013-2014 struktur AG
*
* This file is part of Spreed Speak Freely.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
/*
* Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)

Write Preview
Loading…
Cancel
Save