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

Include variables from 3b5a7688e6.

pull/29/head
Evan Theurer 12 years ago
parent
5fa3690b46
commit
f4a8ea01dd
2 changed files with 125 additions and 91 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. 36
      src/styles/global/_variables.scss
  2. 180
      static/css/bootstrap.min.css

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

@ -18,6 +18,9 @@ @@ -18,6 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
// ** Custom Variables **
// --------------------------------------------------
$background: #e5e5e5;
$componentbg: #f5f5f5;
$componentfg1: #262626;
@ -45,4 +48,35 @@ $font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif; @@ -45,4 +48,35 @@ $font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif;
$base-font-size: 13px;
$base-line-height: 19px;
$audiovideolevel: $actioncolor1;
$audiovideolevel: #9dd53a;
// ** Fontawsome changed variables **
// original at libs/fontawesome/_variables.scss
// --------------------------
// ** Bootstrap changed variables **
// original at libs/bootstrap/_variables.scss
// --------------------------------------------------
//== Scaffolding
//
// ## Settings for some of the most global styles.
//** Background color for `<body>`.
$body-bg: $background;
//== Typography
//
//## Font, line-height, and color for body text, headings, and more.
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
$font-family-base: $font-family-sans-serif;
$font-size-base: $base-font-size;

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

@ -289,10 +289,10 @@ html { @@ -289,10 +289,10 @@ html {
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
font-size: 13px;
line-height: 1.42857;
color: #333333;
background-color: white; }
background-color: #e5e5e5; }
input,
button,
@ -330,7 +330,7 @@ img { @@ -330,7 +330,7 @@ img {
.img-thumbnail {
padding: 4px;
line-height: 1.42857;
background-color: white;
background-color: #e5e5e5;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
@ -343,8 +343,8 @@ img { @@ -343,8 +343,8 @@ img {
border-radius: 50%; }
hr {
margin-top: 20px;
margin-bottom: 20px;
margin-top: 18px;
margin-bottom: 18px;
border: 0;
border-top: 1px solid #eeeeee; }
@ -385,8 +385,8 @@ h1, h2, h3, h4, h5, h6, @@ -385,8 +385,8 @@ h1, h2, h3, h4, h5, h6,
h1, .h1,
h2, .h2,
h3, .h3 {
margin-top: 20px;
margin-bottom: 10px; }
margin-top: 18px;
margin-bottom: 9px; }
h1 small,
h1 .small, .h1 small,
.h1 .small,
@ -401,8 +401,8 @@ h3, .h3 { @@ -401,8 +401,8 @@ h3, .h3 {
h4, .h4,
h5, .h5,
h6, .h6 {
margin-top: 10px;
margin-bottom: 10px; }
margin-top: 9px;
margin-bottom: 9px; }
h4 small,
h4 .small, .h4 small,
.h4 .small,
@ -415,34 +415,34 @@ h6, .h6 { @@ -415,34 +415,34 @@ h6, .h6 {
font-size: 75%; }
h1, .h1 {
font-size: 36px; }
font-size: 33px; }
h2, .h2 {
font-size: 30px; }
font-size: 27px; }
h3, .h3 {
font-size: 24px; }
font-size: 23px; }
h4, .h4 {
font-size: 18px; }
font-size: 17px; }
h5, .h5 {
font-size: 14px; }
font-size: 13px; }
h6, .h6 {
font-size: 12px; }
p {
margin: 0 0 10px; }
margin: 0 0 9px; }
.lead {
margin-bottom: 20px;
font-size: 16px;
margin-bottom: 18px;
font-size: 14px;
font-weight: 200;
line-height: 1.4; }
@media (min-width: 768px) {
.lead {
font-size: 21px; } }
font-size: 19.5px; } }
small,
.small {
@ -530,14 +530,14 @@ a.bg-danger:hover { @@ -530,14 +530,14 @@ a.bg-danger:hover {
background-color: #e4b9b9; }
.page-header {
padding-bottom: 9px;
margin: 40px 0 20px;
padding-bottom: 8px;
margin: 36px 0 18px;
border-bottom: 1px solid #eeeeee; }
ul,
ol {
margin-top: 0;
margin-bottom: 10px; }
margin-bottom: 9px; }
ul ul,
ul ol,
ol ul,
@ -557,7 +557,7 @@ ol { @@ -557,7 +557,7 @@ ol {
dl {
margin-top: 0;
margin-bottom: 20px; }
margin-bottom: 18px; }
dt,
dd {
@ -595,9 +595,9 @@ abbr[data-original-title] { @@ -595,9 +595,9 @@ abbr[data-original-title] {
text-transform: uppercase; }
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
font-size: 17.5px;
padding: 9px 18px;
margin: 0 0 18px;
font-size: 16.25px;
border-left: 5px solid #eeeeee; }
blockquote p:last-child,
blockquote ul:last-child,
@ -642,7 +642,7 @@ blockquote:after { @@ -642,7 +642,7 @@ blockquote:after {
content: ""; }
address {
margin-bottom: 20px;
margin-bottom: 18px;
font-style: normal;
line-height: 1.42857; }
@ -670,9 +670,9 @@ kbd { @@ -670,9 +670,9 @@ kbd {
pre {
display: block;
padding: 9.5px;
margin: 0 0 10px;
font-size: 13px;
padding: 8.5px;
margin: 0 0 9px;
font-size: 12px;
line-height: 1.42857;
word-break: break-all;
word-wrap: break-word;
@ -1371,7 +1371,7 @@ th { @@ -1371,7 +1371,7 @@ th {
.table {
width: 100%;
margin-bottom: 20px; }
margin-bottom: 18px; }
.table > thead > tr > th,
.table > thead > tr > td,
.table > tbody > tr > th,
@ -1395,7 +1395,7 @@ th { @@ -1395,7 +1395,7 @@ th {
.table > tbody + tbody {
border-top: 2px solid #dddddd; }
.table .table {
background-color: white; }
background-color: #e5e5e5; }
.table-condensed > thead > tr > th,
.table-condensed > thead > tr > td,
@ -1520,7 +1520,7 @@ table th[class*="col-"] { @@ -1520,7 +1520,7 @@ table th[class*="col-"] {
@media (max-width: 767px) {
.table-responsive {
width: 100%;
margin-bottom: 15px;
margin-bottom: 13.5px;
overflow-y: hidden;
overflow-x: scroll;
-ms-overflow-style: -ms-autohiding-scrollbar;
@ -1566,8 +1566,8 @@ legend { @@ -1566,8 +1566,8 @@ legend {
display: block;
width: 100%;
padding: 0;
margin-bottom: 20px;
font-size: 21px;
margin-bottom: 18px;
font-size: 19.5px;
line-height: inherit;
color: #333333;
border: 0;
@ -1611,16 +1611,16 @@ input[type="checkbox"]:focus { @@ -1611,16 +1611,16 @@ input[type="checkbox"]:focus {
output {
display: block;
padding-top: 7px;
font-size: 14px;
font-size: 13px;
line-height: 1.42857;
color: #555555; }
.form-control {
display: block;
width: 100%;
height: 34px;
height: 32px;
padding: 6px 12px;
font-size: 14px;
font-size: 13px;
line-height: 1.42857;
color: #555555;
background-color: white;
@ -1655,7 +1655,7 @@ input[type="search"] { @@ -1655,7 +1655,7 @@ input[type="search"] {
-webkit-appearance: none; }
input[type="date"] {
line-height: 34px; }
line-height: 32px; }
.form-group {
margin-bottom: 15px; }
@ -1663,7 +1663,7 @@ input[type="date"] { @@ -1663,7 +1663,7 @@ input[type="date"] {
.radio,
.checkbox {
display: block;
min-height: 20px;
min-height: 18px;
margin-top: 10px;
margin-bottom: 10px;
padding-left: 20px; }
@ -1738,17 +1738,17 @@ select[multiple].input-sm, @@ -1738,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: 46px;
height: 45px;
padding: 10px 16px;
font-size: 18px;
font-size: 17px;
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: 46px;
line-height: 46px; }
height: 45px;
line-height: 45px; }
textarea.input-lg, .input-group-lg > textarea.form-control,
.input-group-lg > textarea.input-group-addon,
@ -1762,15 +1762,15 @@ select[multiple].input-lg, @@ -1762,15 +1762,15 @@ select[multiple].input-lg,
.has-feedback {
position: relative; }
.has-feedback .form-control {
padding-right: 42.5px; }
padding-right: 40px; }
.has-feedback .form-control-feedback {
position: absolute;
top: 25px;
top: 23px;
right: 0;
display: block;
width: 34px;
height: 34px;
line-height: 34px;
width: 32px;
height: 32px;
line-height: 32px;
text-align: center; }
.has-success .help-block,
@ -1888,7 +1888,7 @@ select[multiple].input-lg, @@ -1888,7 +1888,7 @@ select[multiple].input-lg,
padding-top: 7px; }
.form-horizontal .radio,
.form-horizontal .checkbox {
min-height: 27px; }
min-height: 25px; }
.form-horizontal .form-group {
margin-left: -15px;
margin-right: -15px; }
@ -1917,7 +1917,7 @@ select[multiple].input-lg, @@ -1917,7 +1917,7 @@ select[multiple].input-lg,
border: 1px solid transparent;
white-space: nowrap;
padding: 6px 12px;
font-size: 14px;
font-size: 13px;
line-height: 1.42857;
border-radius: 4px;
-webkit-user-select: none;
@ -2103,7 +2103,7 @@ select[multiple].input-lg, @@ -2103,7 +2103,7 @@ select[multiple].input-lg,
.btn-lg, .btn-group-lg > .btn {
padding: 10px 16px;
font-size: 18px;
font-size: 17px;
line-height: 1.33;
border-radius: 6px; }
@ -2795,7 +2795,7 @@ input[type="button"].btn-block { @@ -2795,7 +2795,7 @@ input[type="button"].btn-block {
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
font-size: 14px;
font-size: 13px;
background-color: white;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
@ -2808,7 +2808,7 @@ input[type="button"].btn-block { @@ -2808,7 +2808,7 @@ input[type="button"].btn-block {
left: auto; }
.dropdown-menu .divider {
height: 1px;
margin: 9px 0;
margin: 8px 0;
overflow: hidden;
background-color: #e5e5e5; }
.dropdown-menu > li > a {
@ -3082,7 +3082,7 @@ input[type="button"].btn-block { @@ -3082,7 +3082,7 @@ input[type="button"].btn-block {
.input-group-addon {
padding: 6px 12px;
font-size: 14px;
font-size: 13px;
font-weight: normal;
line-height: 1;
color: #555555;
@ -3100,7 +3100,7 @@ input[type="button"].btn-block { @@ -3100,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: 18px;
font-size: 17px;
border-radius: 6px; }
.input-group-addon input[type="radio"],
.input-group-addon input[type="checkbox"] {
@ -3180,7 +3180,7 @@ input[type="button"].btn-block { @@ -3180,7 +3180,7 @@ input[type="button"].btn-block {
border-color: #428bca; }
.nav .nav-divider {
height: 1px;
margin: 9px 0;
margin: 8px 0;
overflow: hidden;
background-color: #e5e5e5; }
.nav > li > a > img {
@ -3200,7 +3200,7 @@ input[type="button"].btn-block { @@ -3200,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: white;
background-color: #e5e5e5;
border: 1px solid #dddddd;
border-bottom-color: transparent;
cursor: default; }
@ -3258,7 +3258,7 @@ input[type="button"].btn-block { @@ -3258,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: white; } }
border-bottom-color: #e5e5e5; } }
.tab-content > .tab-pane {
display: none; }
@ -3273,7 +3273,7 @@ input[type="button"].btn-block { @@ -3273,7 +3273,7 @@ input[type="button"].btn-block {
.navbar {
position: relative;
min-height: 50px;
margin-bottom: 20px;
margin-bottom: 18px;
border: 1px solid transparent; }
.navbar:before, .navbar:after {
content: " ";
@ -3367,9 +3367,9 @@ input[type="button"].btn-block { @@ -3367,9 +3367,9 @@ input[type="button"].btn-block {
.navbar-brand {
float: left;
padding: 15px 15px;
font-size: 18px;
line-height: 20px;
padding: 16px 15px;
font-size: 17px;
line-height: 18px;
height: 50px; }
.navbar-brand:hover, .navbar-brand:focus {
text-decoration: none; }
@ -3402,11 +3402,11 @@ input[type="button"].btn-block { @@ -3402,11 +3402,11 @@ input[type="button"].btn-block {
display: none; } }
.navbar-nav {
margin: 7.5px -15px; }
margin: 8px -15px; }
.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
line-height: 20px; }
line-height: 18px; }
@media (max-width: 767px) {
.navbar-nav .open .dropdown-menu {
position: static;
@ -3420,7 +3420,7 @@ input[type="button"].btn-block { @@ -3420,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: 20px; }
line-height: 18px; }
.navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus {
background-image: none; } }
@media (min-width: 768px) {
@ -3430,8 +3430,8 @@ input[type="button"].btn-block { @@ -3430,8 +3430,8 @@ input[type="button"].btn-block {
.navbar-nav > li {
float: left; }
.navbar-nav > li > a {
padding-top: 15px;
padding-bottom: 15px; }
padding-top: 16px;
padding-bottom: 16px; }
.navbar-nav.navbar-right:last-child {
margin-right: -15px; } }
@ -3449,8 +3449,8 @@ input[type="button"].btn-block { @@ -3449,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: 8px;
margin-bottom: 8px; }
margin-top: 9px;
margin-bottom: 9px; }
@media (max-width: 767px) {
.navbar-form .form-group {
margin-bottom: 5px; } }
@ -3477,8 +3477,8 @@ input[type="button"].btn-block { @@ -3477,8 +3477,8 @@ input[type="button"].btn-block {
border-bottom-left-radius: 0; }
.navbar-btn {
margin-top: 8px;
margin-bottom: 8px; }
margin-top: 9px;
margin-bottom: 9px; }
.navbar-btn.btn-sm, .btn-group-sm > .navbar-btn.btn {
margin-top: 10px;
margin-bottom: 10px; }
@ -3487,8 +3487,8 @@ input[type="button"].btn-block { @@ -3487,8 +3487,8 @@ input[type="button"].btn-block {
margin-bottom: 14px; }
.navbar-text {
margin-top: 15px;
margin-bottom: 15px; }
margin-top: 16px;
margin-bottom: 16px; }
@media (min-width: 768px) {
.navbar-text {
float: left;
@ -3603,7 +3603,7 @@ input[type="button"].btn-block { @@ -3603,7 +3603,7 @@ input[type="button"].btn-block {
.breadcrumb {
padding: 8px 15px;
margin-bottom: 20px;
margin-bottom: 18px;
list-style: none;
background-color: whitesmoke;
border-radius: 4px; }
@ -3619,7 +3619,7 @@ input[type="button"].btn-block { @@ -3619,7 +3619,7 @@ input[type="button"].btn-block {
.pagination {
display: inline-block;
padding-left: 0;
margin: 20px 0;
margin: 18px 0;
border-radius: 4px; }
.pagination > li {
display: inline; }
@ -3672,7 +3672,7 @@ input[type="button"].btn-block { @@ -3672,7 +3672,7 @@ input[type="button"].btn-block {
.pagination-lg > li > a,
.pagination-lg > li > span {
padding: 10px 16px;
font-size: 18px; }
font-size: 17px; }
.pagination-lg > li:first-child > a,
.pagination-lg > li:first-child > span {
border-bottom-left-radius: 6px;
@ -3697,7 +3697,7 @@ input[type="button"].btn-block { @@ -3697,7 +3697,7 @@ input[type="button"].btn-block {
.pager {
padding-left: 0;
margin: 20px 0;
margin: 18px 0;
list-style: none;
text-align: center; }
.pager:before, .pager:after {
@ -3828,7 +3828,7 @@ a.list-group-item.active > .badge, @@ -3828,7 +3828,7 @@ a.list-group-item.active > .badge,
color: inherit; }
.jumbotron p {
margin-bottom: 15px;
font-size: 21px;
font-size: 20px;
font-weight: 200; }
.container .jumbotron {
border-radius: 6px; }
@ -3843,14 +3843,14 @@ a.list-group-item.active > .badge, @@ -3843,14 +3843,14 @@ a.list-group-item.active > .badge,
padding-right: 60px; }
.jumbotron h1,
.jumbotron .h1 {
font-size: 63px; } }
font-size: 58.5px; } }
.thumbnail {
display: block;
padding: 4px;
margin-bottom: 20px;
margin-bottom: 18px;
line-height: 1.42857;
background-color: white;
background-color: #e5e5e5;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
@ -3873,7 +3873,7 @@ a.thumbnail.active { @@ -3873,7 +3873,7 @@ a.thumbnail.active {
.alert {
padding: 15px;
margin-bottom: 20px;
margin-bottom: 18px;
border: 1px solid transparent;
border-radius: 4px; }
.alert h4 {
@ -3947,8 +3947,8 @@ a.thumbnail.active { @@ -3947,8 +3947,8 @@ a.thumbnail.active {
.progress {
overflow: hidden;
height: 20px;
margin-bottom: 20px;
height: 18px;
margin-bottom: 18px;
background-color: whitesmoke;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
@ -3959,7 +3959,7 @@ a.thumbnail.active { @@ -3959,7 +3959,7 @@ a.thumbnail.active {
width: 0%;
height: 100%;
font-size: 12px;
line-height: 20px;
line-height: 18px;
color: white;
text-align: center;
background-color: #428bca;
@ -4141,7 +4141,7 @@ a.list-group-item-danger { @@ -4141,7 +4141,7 @@ a.list-group-item-danger {
line-height: 1.3; }
.panel {
margin-bottom: 20px;
margin-bottom: 18px;
background-color: white;
border: 1px solid transparent;
border-radius: 4px;
@ -4167,7 +4167,7 @@ a.list-group-item-danger { @@ -4167,7 +4167,7 @@ a.list-group-item-danger {
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: 16px;
font-size: 15px;
color: inherit; }
.panel-title > a {
color: inherit; }
@ -4301,7 +4301,7 @@ a.list-group-item-danger { @@ -4301,7 +4301,7 @@ a.list-group-item-danger {
margin-bottom: 0; }
.panel-group {
margin-bottom: 20px; }
margin-bottom: 18px; }
.panel-group .panel {
margin-bottom: 0;
border-radius: 4px;
@ -4406,7 +4406,7 @@ a.list-group-item-danger { @@ -4406,7 +4406,7 @@ a.list-group-item-danger {
.close {
float: right;
font-size: 21px;
font-size: 19.5px;
font-weight: bold;
line-height: 1;
color: black;
@ -4649,7 +4649,7 @@ button.close { @@ -4649,7 +4649,7 @@ button.close {
.popover-title {
margin: 0;
padding: 8px 14px;
font-size: 14px;
font-size: 13px;
font-weight: normal;
line-height: 18px;
background-color: #f7f7f7;

Write Preview
Loading…
Cancel
Save