Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'master' of github.com:emrecamasuvi/tacirsass
Conflicts: css/base.css css/screen.css sass/partials/_normalize.scss
- Loading branch information
Showing
8 changed files
with
4,257 additions
and
143 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,119 +1,117 @@ | ||
/* | ||
* Bootstrap Responsive v2.0.1 | ||
* | ||
* Copyright 2012 Twitter, Inc | ||
* Licensed under the Apache License v2.0 | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Designed and built with all the love in the world @twitter by @mdo and @fat. | ||
*/ | ||
/* line 27, ../sass/responsive.scss */ | ||
.hidden { display: none; visibility: hidden; } | ||
|
||
/* line 32, ../sass/responsive.scss */ | ||
.row { width: 100%; margin: 0 auto; *zoom: 1; } | ||
/* line 35, ../sass/responsive.scss */ | ||
.row .row { min-width: 0; } | ||
/* line 5, ../sass/mixins.scss */ | ||
.row:before, .row:after { display: table; content: ""; } | ||
/* line 9, ../sass/mixins.scss */ | ||
.row:after { clear: both; } | ||
|
||
@media (max-width: 480px) { /* line 44, ../sass/responsive.scss */ | ||
.row { max-width: 480px; } | ||
/* line 50, ../sass/responsive.scss */ | ||
.nav-collapse { -webkit-transform: translate3d(0, 0, 0); } | ||
/* line 55, ../sass/responsive.scss */ | ||
.page-header h1 small { display: block; line-height: 18px; } | ||
/* line 64, ../sass/responsive.scss */ | ||
input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input { display: block; width: 100%; min-height: 28px; /* Make inputs at least the height of their button counterpart */ /* Makes inputs behave like true block-level elements */ -webkit-box-sizing: border-box; /* Older Webkit */ -moz-box-sizing: border-box; /* Older FF */ -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ } | ||
/* line 76, ../sass/responsive.scss */ | ||
.input-prepend input[class*="span"], .input-append input[class*="span"] { width: auto; } | ||
/* line 82, ../sass/responsive.scss */ | ||
input[type="checkbox"], input[type="radio"] { border: 1px solid #ccc; } | ||
/* line 87, ../sass/responsive.scss */ | ||
.form-horizontal .control-group > label { float: none; width: auto; padding-top: 0; text-align: left; } | ||
/* line 94, ../sass/responsive.scss */ | ||
.form-horizontal .controls { margin-left: 0; } | ||
/* line 98, ../sass/responsive.scss */ | ||
.form-horizontal .control-list { padding-top: 0; } | ||
/* line 102, ../sass/responsive.scss */ | ||
.form-horizontal .form-actions { padding-left: 10px; padding-right: 10px; } | ||
/* line 108, ../sass/responsive.scss */ | ||
.modal { position: absolute; top: 10px; left: 10px; right: 10px; width: auto; margin: 0; } | ||
/* line 115, ../sass/responsive.scss */ | ||
.modal.fade.in { top: auto; } | ||
/* line 117, ../sass/responsive.scss */ | ||
.modal-header .close { padding: 10px; margin: -10px; } | ||
/* line 123, ../sass/responsive.scss */ | ||
.carousel-caption { position: static; } } | ||
@media (max-width: 767px) { /* line 138, ../sass/responsive.scss */ | ||
.container { width: auto; padding: 0 20px; } | ||
/* line 143, ../sass/responsive.scss */ | ||
.row-fluid { width: 100%; } | ||
/* line 147, ../sass/responsive.scss */ | ||
.row { margin-left: 0; } | ||
/* line 152, ../sass/responsive.scss */ | ||
.row > [class*="span"], .row-fluid > [class*="span"] { float: none; display: block; width: auto; margin: 0; } } | ||
@media (min-width: 768px) and (max-width: 979px) { /* line 166, ../sass/responsive.scss */ | ||
.row { max-width: 979px; min-width: 768px; } | ||
/* /* Fixed grid */ @include gridSystem-generate(12, 42px, 20px); /* Fluid grid */ @include fluidGridSystem-generate(12, 5.801104972%, 2.762430939%); /* Input grid */ @include inputGridSystem-generate(12, 42px, 20px); */ } | ||
@media (max-width: 979px) { /* line 191, ../sass/responsive.scss */ | ||
.row { max-width: 979px; } | ||
/* line 194, ../sass/responsive.scss */ | ||
body { padding-top: 0; } | ||
/* line 198, ../sass/responsive.scss */ | ||
.navbar-fixed-top { position: static; margin-bottom: 18px; } | ||
/* line 202, ../sass/responsive.scss */ | ||
.navbar-fixed-top .navbar-inner { padding: 5px; } | ||
/* line 205, ../sass/responsive.scss */ | ||
.navbar .container { width: auto; padding: 0; } | ||
/* line 210, ../sass/responsive.scss */ | ||
.navbar .brand { padding-left: 10px; padding-right: 10px; margin: 0 0 0 -5px; } | ||
/* line 216, ../sass/responsive.scss */ | ||
.navbar .nav-collapse { clear: left; } | ||
/* line 220, ../sass/responsive.scss */ | ||
.navbar .nav { float: none; margin: 0 0 9px; } | ||
/* line 224, ../sass/responsive.scss */ | ||
.navbar .nav > li { float: none; } | ||
/* line 227, ../sass/responsive.scss */ | ||
.navbar .nav > li > a { margin-bottom: 2px; } | ||
/* line 230, ../sass/responsive.scss */ | ||
.navbar .nav > .divider-vertical { display: none; } | ||
/* line 233, ../sass/responsive.scss */ | ||
.navbar .nav .nav-header { color: #999999; text-shadow: none; } | ||
/* line 239, ../sass/responsive.scss */ | ||
.navbar .nav > li > a, .navbar .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } | ||
/* line 245, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu li + li a { margin-bottom: 2px; } | ||
/* line 249, ../sass/responsive.scss */ | ||
.navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover { background-color: #222222; } | ||
/* line 253, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu { position: static; top: auto; left: auto; float: none; display: block; max-width: none; margin: 0 15px; padding: 0; background-color: transparent; border: none; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } | ||
/* line 268, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu:before, .navbar .dropdown-menu:after { display: none; } | ||
/* line 271, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu .divider { display: none; } | ||
/* line 276, ../sass/responsive.scss */ | ||
.navbar-form, .navbar-search { float: none; padding: 9px 15px; margin: 9px 0; border-top: 1px solid #222222; border-bottom: 1px solid #222222; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -moz-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); } | ||
/* line 286, ../sass/responsive.scss */ | ||
.navbar .nav.pull-right { float: none; margin-left: 0; } | ||
/* line 291, ../sass/responsive.scss */ | ||
.navbar-static .navbar-inner { padding-left: 10px; padding-right: 10px; } | ||
/* line 296, ../sass/responsive.scss */ | ||
.btn-navbar { display: block; } | ||
/* line 301, ../sass/responsive.scss */ | ||
.nav-collapse { overflow: hidden; height: 0; } } | ||
@media (min-width: 980px) { /* line 313, ../sass/responsive.scss */ | ||
.nav-collapse.collapse { height: auto !important; } | ||
/* line 316, ../sass/responsive.scss */ | ||
.row { min-width: 980px; } } | ||
@media (min-width: 1200px) { /* line 328, ../sass/responsive.scss */ | ||
.row { max-width: 1440px; } | ||
/* /* Fixed grid */ @include gridSystem-generate(12, 70px, 30px); /* Fluid grid */ @include fluidGridSystem-generate(12, 5.982905983%, 2.564102564%); /* Input grid */ @include inputGridSystem-generate(12, 70px, 30px); */ | ||
/* line 342, ../sass/responsive.scss */ | ||
.thumbnails { margin-left: -30px; } | ||
/* line 345, ../sass/responsive.scss */ | ||
.thumbnails > li { margin-left: 30px; } } | ||
@media (-webkit-min-device-pixel-ratio:1.5), (min-device-pixel-ratio:1.5) { /* line 355, ../sass/responsive.scss */ | ||
button { border: none; padding: 0 16px; box-shadow: inset 0 0 1px black, inset 0 1px 0 #75c2f8, 0 1px 1px -1px rgba(0, 0, 0, 0.5); } } | ||
/* | ||
* Bootstrap Responsive v2.0.1 | ||
* | ||
* Copyright 2012 Twitter, Inc | ||
* Licensed under the Apache License v2.0 | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Designed and built with all the love in the world @twitter by @mdo and @fat. | ||
*/ | ||
/* line 27, ../sass/responsive.scss */ | ||
.hidden { display: none; visibility: hidden; } | ||
|
||
/* line 32, ../sass/responsive.scss */ | ||
.row { width: 100%; margin: 0 auto; *zoom: 1; } | ||
/* line 35, ../sass/responsive.scss */ | ||
.row .row { min-width: 0; } | ||
/* line 5, ../sass/mixins.scss */ | ||
.row:before, .row:after { display: table; content: ""; } | ||
/* line 9, ../sass/mixins.scss */ | ||
.row:after { clear: both; } | ||
|
||
@media (max-width: 480px) { /* line 44, ../sass/responsive.scss */ | ||
.row { max-width: 480px; } | ||
/* line 50, ../sass/responsive.scss */ | ||
.nav-collapse { -webkit-transform: translate3d(0, 0, 0); } | ||
/* line 55, ../sass/responsive.scss */ | ||
.page-header h1 small { display: block; line-height: 18px; } | ||
/* line 64, ../sass/responsive.scss */ | ||
input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input { display: block; width: 100%; min-height: 28px; /* Make inputs at least the height of their button counterpart */ /* Makes inputs behave like true block-level elements */ -webkit-box-sizing: border-box; /* Older Webkit */ -moz-box-sizing: border-box; /* Older FF */ -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ } | ||
/* line 76, ../sass/responsive.scss */ | ||
.input-prepend input[class*="span"], .input-append input[class*="span"] { width: auto; } | ||
/* line 82, ../sass/responsive.scss */ | ||
input[type="checkbox"], input[type="radio"] { border: 1px solid #ccc; } | ||
/* line 87, ../sass/responsive.scss */ | ||
.form-horizontal .control-group > label { float: none; width: auto; padding-top: 0; text-align: left; } | ||
/* line 94, ../sass/responsive.scss */ | ||
.form-horizontal .controls { margin-left: 0; } | ||
/* line 98, ../sass/responsive.scss */ | ||
.form-horizontal .control-list { padding-top: 0; } | ||
/* line 102, ../sass/responsive.scss */ | ||
.form-horizontal .form-actions { padding-left: 10px; padding-right: 10px; } | ||
/* line 108, ../sass/responsive.scss */ | ||
.modal { position: absolute; top: 10px; left: 10px; right: 10px; width: auto; margin: 0; } | ||
/* line 115, ../sass/responsive.scss */ | ||
.modal.fade.in { top: auto; } | ||
/* line 117, ../sass/responsive.scss */ | ||
.modal-header .close { padding: 10px; margin: -10px; } | ||
/* line 123, ../sass/responsive.scss */ | ||
.carousel-caption { position: static; } } | ||
@media (max-width: 767px) { /* line 138, ../sass/responsive.scss */ | ||
.container { width: auto; padding: 0 20px; } | ||
/* line 143, ../sass/responsive.scss */ | ||
.row-fluid { width: 100%; } | ||
/* line 147, ../sass/responsive.scss */ | ||
.row { margin-left: 0; } | ||
/* line 152, ../sass/responsive.scss */ | ||
.row > [class*="span"], .row-fluid > [class*="span"] { float: none; display: block; width: auto; margin: 0; } } | ||
@media (min-width: 768px) and (max-width: 979px) { /* line 166, ../sass/responsive.scss */ | ||
.row { max-width: 979px; min-width: 768px; } } | ||
@media (max-width: 979px) { /* line 182, ../sass/responsive.scss */ | ||
.row { max-width: 979px; } | ||
/* line 185, ../sass/responsive.scss */ | ||
body { padding-top: 0; } | ||
/* line 189, ../sass/responsive.scss */ | ||
.navbar-fixed-top { position: static; margin-bottom: 18px; } | ||
/* line 193, ../sass/responsive.scss */ | ||
.navbar-fixed-top .navbar-inner { padding: 5px; } | ||
/* line 196, ../sass/responsive.scss */ | ||
.navbar .container { width: auto; padding: 0; } | ||
/* line 201, ../sass/responsive.scss */ | ||
.navbar .brand { padding-left: 10px; padding-right: 10px; margin: 0 0 0 -5px; } | ||
/* line 207, ../sass/responsive.scss */ | ||
.navbar .nav-collapse { clear: left; } | ||
/* line 211, ../sass/responsive.scss */ | ||
.navbar .nav { float: none; margin: 0 0 9px; } | ||
/* line 215, ../sass/responsive.scss */ | ||
.navbar .nav > li { float: none; } | ||
/* line 218, ../sass/responsive.scss */ | ||
.navbar .nav > li > a { margin-bottom: 2px; } | ||
/* line 221, ../sass/responsive.scss */ | ||
.navbar .nav > .divider-vertical { display: none; } | ||
/* line 224, ../sass/responsive.scss */ | ||
.navbar .nav .nav-header { color: #999999; text-shadow: none; } | ||
/* line 230, ../sass/responsive.scss */ | ||
.navbar .nav > li > a, .navbar .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } | ||
/* line 236, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu li + li a { margin-bottom: 2px; } | ||
/* line 240, ../sass/responsive.scss */ | ||
.navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover { background-color: #222222; } | ||
/* line 244, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu { position: static; top: auto; left: auto; float: none; display: block; max-width: none; margin: 0 15px; padding: 0; background-color: transparent; border: none; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } | ||
/* line 259, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu:before, .navbar .dropdown-menu:after { display: none; } | ||
/* line 262, ../sass/responsive.scss */ | ||
.navbar .dropdown-menu .divider { display: none; } | ||
/* line 267, ../sass/responsive.scss */ | ||
.navbar-form, .navbar-search { float: none; padding: 9px 15px; margin: 9px 0; border-top: 1px solid #222222; border-bottom: 1px solid #222222; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -moz-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); } | ||
/* line 277, ../sass/responsive.scss */ | ||
.navbar .nav.pull-right { float: none; margin-left: 0; } | ||
/* line 282, ../sass/responsive.scss */ | ||
.navbar-static .navbar-inner { padding-left: 10px; padding-right: 10px; } | ||
/* line 287, ../sass/responsive.scss */ | ||
.btn-navbar { display: block; } | ||
/* line 292, ../sass/responsive.scss */ | ||
.nav-collapse { overflow: hidden; height: 0; } } | ||
@media (min-width: 980px) { /* line 302, ../sass/responsive.scss */ | ||
.nav-collapse.collapse { height: auto !important; } | ||
/* line 305, ../sass/responsive.scss */ | ||
.row { min-width: 980px; } } | ||
@media (min-width: 1200px) { /* line 317, ../sass/responsive.scss */ | ||
.row { max-width: 1440px; } | ||
/* line 323, ../sass/responsive.scss */ | ||
.thumbnails { margin-left: -30px; } | ||
/* line 326, ../sass/responsive.scss */ | ||
.thumbnails > li { margin-left: 30px; } } | ||
@media (-webkit-min-device-pixel-ratio:1.5), (min-device-pixel-ratio:1.5) { /* line 336, ../sass/responsive.scss */ | ||
button { border: none; padding: 0 16px; box-shadow: inset 0 0 1px black, inset 0 1px 0 #75c2f8, 0 1px 1px -1px rgba(0, 0, 0, 0.5); } } |
Oops, something went wrong.