Working : Finish renaming class for bootstrap migration

This commit is contained in:
mespeche
2013-09-04 15:05:49 +02:00
parent dafaa02718
commit 7258b24c88
25 changed files with 2445 additions and 391 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -20,7 +20,7 @@
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid @white;
border-bottom: 6px solid #FFF;
position: absolute;
top: -6px;
left: 7px;
@@ -41,15 +41,15 @@
}
td {
&.day:hover {
background: @grayLighter;
background: @gray-lighter;
cursor: pointer;
}
&.day.disabled {
color: @grayLighter;
color: @gray-lighter;
}
&.old,
&.new {
color: @grayLight;
color: @gray-light;
}
&.active,
&.active:hover {
@@ -67,7 +67,7 @@
cursor: pointer;
.rounded(4px);
&:hover {
background: @grayLighter;
background: @gray-lighter;
}
&.active {
#gradient > .vertical(rgb(243,153,34),rgb(227,83,11));
@@ -75,7 +75,7 @@
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}
&.old {
color: @grayLight;
color: @gray-light;
}
}
}
@@ -86,14 +86,14 @@
}
&.next,
&.prev {
font-size: @baseFontSize * 1.5;
font-size: @font-size-base * 1.5;
}
}
thead tr:first-child th {
cursor: pointer;
&:hover{
background: @grayLighter;
background: @gray-lighter;
}
}

View File

@@ -47,19 +47,19 @@ label {
// Warning
form .warning {
.formFieldState(@warningText, @warningText, @warningBackground);
//.formFieldState(@warningText, @warningText, @warningBackground);
}
// Error
form .error {
.formFieldState(@errorText, @errorText, @errorBackground);
//.formFieldState(@errorText, @errorText, @errorBackground);
}
// Success
form .success {
.formFieldState(@successText, @successText, @successBackground);
//.formFieldState(@successText, @successText, @successBackground);
}
// Success
form .info {
.formFieldState(@infoText, @infoText, @infoBackground);
//.formFieldState(@infoText, @infoText, @infoBackground);
}
@@ -165,4 +165,33 @@ form .info {
text-align: right;
}
}
}
// -- Sign in --
.form-signin{
// .form-control {
// position: relative;
// font-size: 16px;
// height: auto;
// padding: 10px;
// -webkit-box-sizing: border-box;
// -moz-box-sizing: border-box;
// box-sizing: border-box;
// &:focus {
// z-index: 2;
// }
// }
// input[type="text"] {
// margin-bottom: -1px;
// border-bottom-left-radius: 0;
// border-bottom-right-radius: 0;
// }
// input[type="password"] {
// margin-bottom: 10px;
// border-top-left-radius: 0;
// border-top-right-radius: 0;
// }
}

View File

@@ -24,6 +24,10 @@
// Navbar button for toggling navbar items in responsive layouts
// These definitions need to come after '.navbar .btn'
.navbar .btn-navbar {
.buttonBackground(darken(@btnPrimaryBackground, 5%), darken(@btnPrimaryBackgroundHighlight, 5%));
.navbar .btn {
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
}
.navbar-default .navbar-toggle .icon-bar{
background-color: @btn-primary-color;
}

View File

@@ -1,248 +1,248 @@
@import "variables.less";
// @import "navbar.less";
// @import "scaffolding.less";
// @import "type.less";
// @import "breadcrumbs.less";
// @import "forms.less";
// @import "datepicker.less";
// @import "modals.less";
// @import "tables.less";
// @import "tablesorter.less";
@import "navbar.less";
@import "scaffolding.less";
@import "type.less";
@import "breadcrumbs.less";
@import "forms.less";
@import "datepicker.less";
@import "modals.less";
@import "tables.less";
@import "tablesorter.less";
// // -- Base styling ------------------------------------------------------------
// -- Base styling ------------------------------------------------------------
// #wrapper {
// padding-top: 20px;
// }
#wrapper {
padding-top: 20px;
}
// // Bootstrap Adjustements ------------------------------------------------------
// Bootstrap Adjustements ------------------------------------------------------
// .footer {
// background: none repeat scroll 0 0 transparent;
// border: medium none;
// box-shadow: none;
// color: #7D756A;
// margin-bottom: 0;
// padding: 35px 15px 15px;
// text-align: left;
// }
.footer {
background: none repeat scroll 0 0 transparent;
border: medium none;
box-shadow: none;
color: #7D756A;
margin-bottom: 0;
padding: 35px 15px 15px;
text-align: left;
}
// // -- Top bar -----------------------------------------------------------------
// -- Top bar -----------------------------------------------------------------
// .topbar {
.topbar {
// background: url("@{imgDir}/top.jpg") repeat-x;
// font-weight: bold;
background: url("@{imgDir}/top.jpg") repeat-x;
font-weight: bold;
// .version-info {
// line-height: @topBarHeight;
// height: @topBarHeight;
// background: url("@{imgDir}/top-bar-logo.png") left -3px no-repeat;
// padding-left: 100px;
// text-shadow: 0px 1px 1px black;
// color: #6d737b;
// }
.version-info {
line-height: @topBarHeight;
height: @topBarHeight;
background: url("@{imgDir}/top-bar-logo.png") left -3px no-repeat;
padding-left: 100px;
text-shadow: 0px 1px 1px black;
color: #6d737b;
}
// .form-search, .btn-group{
// margin-top: 10px;
// }
// }
.form-search, .btn-group{
margin-top: 10px;
}
}
// // -- Brandbar ----------------------------------------------------------------
// -- Brandbar ----------------------------------------------------------------
// .loginpage {
.loginpage {
// .hero-unit {
// background-color: transparent;
.hero-unit {
background-color: transparent;
// h1 {
// margin-bottom: 25px;
// }
// }
h1 {
margin-bottom: 25px;
}
}
// .well {
// background-color: #E4E3DE;
// border: 1px solid rgba(0, 0, 0, 0.2);
// box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset;
// }
// }
.well {
background-color: #E4E3DE;
border: 1px solid rgba(0, 0, 0, 0.2);
box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset;
}
}
// // -- Feed list on home page --------------------------------------------------
// -- Feed list on home page --------------------------------------------------
// .feed-list {
// h2 {
// font-size: 24px;
// line-height: 120%;
// color: #E9730F;
.feed-list {
h2 {
font-size: 24px;
line-height: 120%;
color: #E9730F;
// a {
// &:hover {
// color: inherit;
// text-decoration: none;
// }
// }
// }
a {
&:hover {
color: inherit;
text-decoration: none;
}
}
}
// h3 {
// margin-bottom: 0;
// padding-bottom: 0;
// font-size: 90%;
// line-height: 100%;
// }
h3 {
margin-bottom: 0;
padding-bottom: 0;
font-size: 90%;
line-height: 100%;
}
// .feed-list-item{
// padding: 10px 20px;
// }
// }
.feed-list-item{
padding: 10px 20px;
}
}
// .brandbar {
.brandbar {
// background: url("@{imgDir}/header.jpg") repeat-x;
// height: 90px;
background: url("@{imgDir}/header.jpg") repeat-x;
height: 90px;
// a.brand {
// text-indent: -133337px;
// display: block;
// float: left;
// margin-right: 20px;
// background: url("@{imgDir}/logo.png") 0px 12px no-repeat;
// width: 124px;
// height: 63px;
// }
a.brand {
text-indent: -133337px;
display: block;
float: left;
margin-right: 20px;
background: url("@{imgDir}/logo.png") 0px 12px no-repeat;
width: 124px;
height: 63px;
}
// .breadcrumb {
// .rounded(0px);
// padding: 25px 0px 25px 30px;
// background: url("@{imgDir}/logo-light.png") left center no-repeat;
// float: left;
// margin: 12px 0px 0px 0px;
.breadcrumb {
.rounded(0px);
padding: 25px 0px 25px 30px;
background: url("@{imgDir}/logo-light.png") left center no-repeat;
float: left;
margin: 12px 0px 0px 0px;
// a {
// color: #949aa1;
// text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
// }
a {
color: #949aa1;
text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
}
// .active {
// color: #FFF;
// text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
// border-bottom: 1px dotted white;
// }
// }
.active {
color: #FFF;
text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
border-bottom: 1px dotted white;
}
}
// .Blocmoncompte {
// float: right;
// margin: 0px;
// padding: 0px;
// margin-top: 35px;
.Blocmoncompte {
float: right;
margin: 0px;
padding: 0px;
margin-top: 35px;
// color: white;
// font-size: 13px;
// text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
// }
color: white;
font-size: 13px;
text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
}
// dt {
// float: left;
// margin-right: 15px;
// }
dt {
float: left;
margin-right: 15px;
}
// .deconnexion {
// float: right;
// margin: 0px;
.deconnexion {
float: right;
margin: 0px;
// a {
// text-indent: -13337px;
// display: block;
// background: url("@{imgDir}/deconnexion.png") no-repeat;
// width: 23px;
// height: 24px;
// }
// }
// }
a {
text-indent: -13337px;
display: block;
background: url("@{imgDir}/deconnexion.png") no-repeat;
width: 23px;
height: 24px;
}
}
}
// .brandbar-wide {
// width: 100%;
// }
.brandbar-wide {
width: 100%;
}
// // -- Login form --------------------------------------------------------------
// -- Login form --------------------------------------------------------------
// .form-signin {
// max-width: 400px;
// padding: 19px 29px 29px;
// margin: 0 auto 20px;
// background-color: #fff;
// border: 1px solid #e5e5e5;
// .rounded(5px);
// .box-shadow;
// }
.form-signin {
max-width: 400px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
background-color: #fff;
border: 1px solid #e5e5e5;
.rounded(5px);
.box-shadow;
}
// // -- General decoration of back-office boxes ---------------------------------
// -- General decoration of back-office boxes ---------------------------------
// .general-block-decorator {
// background: none repeat scroll 0 0 white;
// border: 1px solid rgba(0, 0, 0, 0.2);
// border-radius: 4px 4px 4px 4px;
// box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset, 0 2px 3px rgba(0, 0, 0, 0.1);
// padding: 1em;
// margin-bottom: 20px;
.general-block-decorator {
background: none repeat scroll 0 0 white;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 4px 4px 4px 4px;
box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset, 0 2px 3px rgba(0, 0, 0, 0.1);
padding: 1em;
margin-bottom: 20px;
// // The block title
// .title {
// color: #5A6876;
// text-transform: uppercase;
// font-weight: bold;
// padding-bottom: 0.5em;
// line-height: 30px;
// }
// The block title
.title {
color: #5A6876;
text-transform: uppercase;
font-weight: bold;
padding-bottom: 0.5em;
line-height: 30px;
}
// .title-without-tabs {
// border-bottom: 2px solid #A5CED8;
// margin-bottom: 0.5em;
// }
.title-without-tabs {
border-bottom: 2px solid #A5CED8;
margin-bottom: 0.5em;
}
// // The action bar on the right
// .actions {
// text-align: right;
// }
// }
// The action bar on the right
.actions {
text-align: right;
}
}
// // The overall form container
// .form-container {
// The overall form container
.form-container {
// // The inner toolbar (flags & save buttons)
// .inner-toolbar {
// The inner toolbar (flags & save buttons)
.inner-toolbar {
// line-height: 30px;
// margin-bottom: 1em;
// border-bottom: 1px dotted #A5CED8;
// padding-bottom: 0.5em;
line-height: 30px;
margin-bottom: 1em;
border-bottom: 1px dotted #A5CED8;
padding-bottom: 0.5em;
// .inner-actions {
// text-align: right;
// }
.inner-actions {
text-align: right;
}
// .nav-pills {
// margin-bottom: 0;
.nav-pills {
margin-bottom: 0;
// li a {
// padding: 4px;
// opacity: 0.3;
// }
li a {
padding: 4px;
opacity: 0.3;
}
// li.active a {
// opacity: 1;
// background-color: #E7E7E7;
// }
// }
// }
// }
li.active a {
opacity: 1;
background-color: #E7E7E7;
}
}
}
}
// // -- Editable tweaks ---------------------------------------------------------
// -- Editable tweaks ---------------------------------------------------------
// .editable-click, a.editable-click, a.editable-click:hover {
// border-bottom: 1px dotted #0088CC;
// }
.editable-click, a.editable-click, a.editable-click:hover {
border-bottom: 1px dotted #0088CC;
}
// .ui-slider{
// margin-top: 23px;
// }
.ui-slider{
margin-top: 23px;
}

View File

@@ -8,6 +8,11 @@
@imgDir : '../img';
@topBarHeight: 50px;
// Brand colors
// -------------------------
@brand-primary: #f39922;
// Links
// -------------------------
@@ -21,11 +26,22 @@
// Buttons
// -------------------------
@btn-primary-bg: #f39922;
@btn-primary-bg: @brand-primary;
// Iconography
// -------------------------
@icon-font-path: "../fonts/bootstrap/";
@icon-font-name: "glyphicons-halflings-regular";
@icon-font-name: "glyphicons-halflings-regular";
// COMPONENT VARIABLES
// --------------------------------------------------
// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
@zindex-dropdown: 1005;