Skip to content

GitLab

Commit 4f3b5b7a authored by Leonardo Piccioni de Almeida's avatar Leonardo Piccioni de Almeida
Browse files

Merge branch 'bootstrap-wip' into sass

parents a4879dbc 207f7d6e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 928 additions and 44 deletions
courses_legacy/static/scss/base/_bootstrap-variables.scss 0 → 100644
View file @ 4f3b5b7a
This diff is collapsed.
courses_legacy/static/scss/base/_mixins.scss
View file @ 4f3b5b7a
......@@ -98,7 +98,7 @@
color: $color;
cursor: pointer;
background-color: $bg-color;
@include transition(all 0.5s ease);
transition: all 0.5s ease;
&:before {
color: $color;
}
......@@ -118,7 +118,7 @@
border-bottom-width: 1px;
cursor: pointer;
line-height: 1.2;
@include transition(all 0.2s ease);
transition: all 0.2s ease;
&:before {
color: $color;
}
......
courses_legacy/static/scss/components/_buttons.scss
View file @ 4f3b5b7a
......@@ -51,7 +51,7 @@
font-weight: $bold;
max-height: 33px;
text-transform: lowercase;
@include transition(all 0.2s ease);
transition: all 0.2s ease;
@media screen and (max-width: $screen-xs-max) {
font-size: $font-size-small;
padding: 3px 6px;
......
courses_legacy/static/scss/components/_widgets-grid.scss
View file @ 4f3b5b7a
......@@ -3,7 +3,16 @@
.widget {
.line {
@extend .row;
margin-left: ceil(($grid-gutter-width / -2));
margin-right: floor(($grid-gutter-width / -2));
&:before, &:after {
content: " ";
display: table;
}
&:after {
clear: both;
}
&.one-column {
.column {
@extend .col-xs-12;
......
courses_legacy/static/scss/layout/_main-nav.scss
View file @ 4f3b5b7a
......@@ -7,7 +7,7 @@
left: -245px;
top: 0;
position: fixed;
@include transition(all 0.5s ease);
transition: all 0.5s ease;
width: 85px;
z-index: 1000;
a {
......@@ -22,7 +22,7 @@
}
@media screen and (min-width: $screen-sm-min) {
left: 0;
width: 100px;
width: 100px;
}
}
.main-nav-opened { // when the offcanvas menu is opened
......@@ -35,7 +35,7 @@
.user-nav {
font-size: $font-size-small;
font-weight: $semi-bold;
margin: 80px 10px 10px;
margin: 80px 10px 10px;
text-align: center;
@media screen and (min-width: $screen-sm-min) {
margin-top: 105px;
......@@ -60,7 +60,7 @@
}
.submenu {
margin-bottom: 20px;
ul {
ul {
li {
font-size: 11px;
font-weight: $normal;
......@@ -120,7 +120,7 @@
.main-nav-opened { // when the offcanvas menu is opened
.user-nav {
font-size: $font-size-large;
margin: 80px 25px 25px;
margin: 80px 25px 25px;
text-align: left;
@media screen and (min-width: $screen-sm-min) {
margin-top: 105px;
......@@ -164,7 +164,7 @@
.legal-text {
color: #fff;
font-size: $font-size-small;
text-align: center;
text-align: center;
}
}
.main-nav-opened { // when the offcanvas menu is opened
......
courses_legacy/static/scss/layout/_site-header.scss
View file @ 4f3b5b7a
......@@ -5,7 +5,7 @@
background-color: $site-header-bg-color;
box-shadow: 2px 2px 4px 0 rgba(0, 0, 0, 0.5);
height: 60px;
@include transition(width 0.5s ease);
transition: width 0.5s ease;
position: fixed;
top: 0;
left: 0;
......
courses_legacy/static/scss/main-paralapraca.scss
View file @ 4f3b5b7a
......@@ -3,6 +3,7 @@
// need to be declared and imported before Bootstrap's files
//== Project variables
@import "base/bootstrap-variables";
@import "base/variables";
//== Theme variables
......
courses_legacy/static/scss/pages/_course-activity.scss
View file @ 4f3b5b7a
......@@ -212,7 +212,7 @@
.radio {
margin-bottom: 12px;
position: relative;
@include transition(color .25s linear);
transition: color .25s linear;
input {
outline: none !important;
......@@ -244,17 +244,17 @@
text-align: center;
line-height: 23px;
font-size: 23px;
@include transition(color .25s linear);
transition: color .25s linear;
.first-icon,
.second-icon {
position: absolute;
left: 0;
top: 0;
@include opacity(100);
opacity: 100;
}
.second-icon {
@include opacity(0);
opacity: 0;
}
}
......@@ -265,10 +265,10 @@
&:hover {
cursor:pointer;
.first-icon {
@include opacity(0);
opacity: 0;
}
.second-icon {
@include opacity(100);
opacity: 100;
}
}
......@@ -280,10 +280,10 @@
color: $brand-success;
}
.first-icon {
@include opacity(0);
opacity: 0;
}
.second-icon {
@include opacity(100);
opacity: 100;
}
}
......@@ -296,20 +296,20 @@
color: mix($gray, white, 38%);
}
.first-icon {
@include opacity(100);
opacity: 100;
}
.second-icon {
@include opacity(0);
opacity: 0;
}
&.checked {
.icons {
color: mix($gray, white, 38%);
}
.first-icon {
@include opacity(0);
opacity: 0;
}
.second-icon {
@include opacity(100);
opacity: 100;
}
}
}
......
courses_legacy/static/scss/pages/_course-content.scss
View file @ 4f3b5b7a
......@@ -643,7 +643,7 @@
.units {
width: 100%;
.units-title {
background: $brand-primary;
background: $teal;
border-radius: 20px;
color: #fff;
display: block;
......@@ -680,7 +680,7 @@
display: block;
height: 25px;
width: 25px;
@include transition(background 0.5s ease);
transition: background 0.5s ease;
}
}
&.current, &.done {
......
courses_legacy/static/scss/pages/_my-courses.scss
View file @ 4f3b5b7a
......@@ -2,10 +2,10 @@
// --------------------------------------------------
.my-courses {
.nav-tabs {
border-bottom-color: darken($gray,10%);
> li {
> li {
cursor: pointer;
> a {
background-color: darken($gray,10%);
......@@ -14,14 +14,14 @@
color: #fff;
cursor: pointer;
font-weight: $bold;
@include transition(all 0.5s ease);
transition: all 0.5s ease;
}
&.active, &:active {
a {
background-color: $gray;
border: transparent;
color: #fff;
}
}
}
&:hover, &:focus {
a {
......@@ -42,8 +42,8 @@
header {
.course-title {
color: #000;
font-size: 30px;
margin: 0 0 10px;
font-size: 30px;
margin: 0 0 10px;
}
.progress {
border-radius: 0px;
......
courses_legacy/static/scss/theme/_variables.scss
View file @ 4f3b5b7a
......@@ -14,7 +14,7 @@ $red: #d51300;
$pink: #cf086a;
$purple: #993671;
$gray: #4a4a4a;
$teal: #17A9AD;
$teal: #17a9ad;
//## Override Bootstrap's variables
// --------------------------------------------------
......
courses_legacy/static/scss/vendor/flatui/checkbox-and-radio.scss
View file @ 4f3b5b7a
......@@ -7,7 +7,7 @@
margin-bottom: 12px;
padding-left: 32px;
position: relative;
@include transition(color .25s linear);
transition: color .25s linear;
input {
outline: none !important;
......@@ -29,17 +29,17 @@
text-align: center;
line-height: 23px;
font-size: 23px;
@include transition(color .25s linear);
transition: color .25s linear;
.first-icon,
.second-icon {
position: absolute;
left: 0;
top: 0;
@include opacity(100);
opacity: 100;
}
.second-icon {
@include opacity(0);
opacity: 0;
}
}
......@@ -50,10 +50,10 @@
&:hover {
cursor:pointer;
.first-icon {
@include opacity(0);
opacity: 0;
}
.second-icon {
@include opacity(100);
opacity: 100;
}
}
......@@ -65,10 +65,10 @@
color: $brand-success;
}
.first-icon {
@include opacity(0);
opacity: 0;
}
.second-icon {
@include opacity(100);
opacity: 100;
}
}
......@@ -81,20 +81,20 @@
color: mix($gray, white, 38%);
}
.first-icon {
@include opacity(100);
opacity: 100;
}
.second-icon {
@include opacity(0);
opacity: 0;
}
&.checked {
.icons {
color: mix($gray, white, 38%);
}
.first-icon {
@include opacity(0);
opacity: 0;
}
.second-icon {
@include opacity(100);
opacity: 100;
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment