Commit b8e4f818 authored by Holly Elisabeth Oegema's avatar Holly Elisabeth Oegema Committed by Mirko Vucicevich

Revert "Merge branch 'master' into 'update-styles'"

This reverts commit 07a78d1d, reversing
changes made to fabe641d.
parent ca635f38
......@@ -10,4 +10,5 @@ whoosh_index/
bin/
lib/
pyvenv.cfg
.vscode
.DS_Store
......@@ -62,6 +62,7 @@ def frontpage(request):
if not request.user.is_authenticated:
return render(request, 'UI/frontpage-nologin.html')
else:
username = request.user.username
# Get all this person's shit
owned_groups = request.user.owned_groups.all()
other_groups = request.user.contentgroup_set.all()
......@@ -112,6 +113,7 @@ def frontpage(request):
).distinct().order_by('-edit_date')[:5]
context = {
'username': username,
'owned_groups': owned_groups,
'other_groups': other_groups,
'owned_layers': owned_layers.count(),
......
......@@ -4117,16 +4117,16 @@ a.badge:hover, a.badge:focus {
cursor: pointer; }
.jumbotron {
padding-top: 30px;
padding-bottom: 30px;
margin-bottom: 30px;
padding-top: 15px;
padding-bottom: 15px;
margin-bottom: 15px;
color: inherit;
background-color: #ecf0f1; }
.jumbotron h1,
.jumbotron .h1 {
color: inherit; }
.jumbotron p {
margin-bottom: 15px;
margin-bottom: 7.5px;
font-size: 23px;
font-weight: 200; }
.jumbotron > hr {
......@@ -4139,11 +4139,11 @@ a.badge:hover, a.badge:focus {
max-width: 100%; }
@media screen and (min-width: 768px) {
.jumbotron {
padding-top: 48px;
padding-bottom: 48px; }
padding-top: 24px;
padding-bottom: 24px; }
.container .jumbotron, .container-fluid .jumbotron {
padding-right: 60px;
padding-left: 60px; }
padding-right: 30px;
padding-left: 30px; }
.jumbotron h1,
.jumbotron .h1 {
font-size: 68px; } }
......
......@@ -5,7 +5,7 @@
*/
// Core variables and mixins
@import "bootstrap/variables";
@import "variables";
@import "bootstrap/mixins";
// Reset and dependencies
......
.sidebar-container {
background-color: #373d47;
color: #979da7;
height: 100vh;
width: 60px;
flex: 0 0 60px;
overflow: hidden;
z-index: 1000;
transition: flex-basis 250ms ease-out; }
.sidebar-container.expanded {
overflow: visible;
flex-basis: 200px; }
.sidebar-container.expanded .sidebar-item {
width: auto; }
.sidebar-container.expanded .sidebar-item .sidebar-title {
display: block; }
.sidebar-container:hover {
overflow: visible; }
.sidebar {
line-height: 60px;
width: 200px; }
.sidebar .nav {
display: flex;
flex-direction: column;
height: 100vh; }
.sidebar-item {
width: 60px;
transition: width 100ms ease-out;
cursor: pointer; }
.sidebar-item a {
color: #ffffff;
align-items: center;
display: flex !important;
height: 60px;
padding: 0 !important; }
.sidebar-item i {
color: #ecf0f1;
font-size: 19px;
text-align: center;
width: 60px; }
.sidebar-item.sidebar-section-expand {
margin-top: auto; }
.sidebar-item.sidebar-section-close {
margin-top: auto; }
.sidebar-item a.active {
box-shadow: 0px 0px 28px -9px rgba(0, 0, 0, 0.75); }
.sidebar-item:hover {
width: auto;
box-shadow: 0px 0px 28px -9px rgba(0, 0, 0, 0.75); }
.sidebar-item:hover i {
color: #ffffff; }
.sidebar-item:hover a:hover {
background-color: #7b8a8b; }
.sidebar-item:hover .sidebar-title {
display: block; }
.sidebar-item.sidebar-section-home a:hover, .sidebar-item.sidebar-section-home a.active {
background-color: #455a64; }
.sidebar-item.sidebar-section-groups a:hover, .sidebar-item.sidebar-section-groups a.active {
background-color: #F57C00; }
.sidebar-item.sidebar-section-screens a:hover, .sidebar-item.sidebar-section-screens a.active {
background-color: #C2185B; }
.sidebar-item.sidebar-section-slideshows a:hover, .sidebar-item.sidebar-section-slideshows a.active {
background-color: #512DA8; }
.sidebar-item.sidebar-section-slides a:hover, .sidebar-item.sidebar-section-slides a.active {
background-color: #1976D2; }
.sidebar-item.sidebar-section-widgets a:hover, .sidebar-item.sidebar-section-widgets a.active {
background-color: #00796B; }
.sidebar-item.sidebar-section-images a:hover, .sidebar-item.sidebar-section-images a.active {
background-color: #AFB42B; }
.sidebar-item.sidebar-section-videos a:hover, .sidebar-item.sidebar-section-videos a.active {
background-color: #FFA000; }
.sidebar-item.sidebar-section-trashbin a:hover, .sidebar-item.sidebar-section-trashbin a.active {
background-color: #FF5252; }
.sidebar-title {
display: none;
height: 60px;
padding: 19.5px 15px;
font-size: 19px;
line-height: 1;
margin: 0; }
.pageheader {
margin-top: 36px;
margin-bottom: 36px;
position: relative;
display: flex;
justify-content: space-between;
box-shadow: 0px 0px 15px -12px rgba(0, 0, 0, 0.75); }
.pageheader h2 {
margin: 0; }
.pageheader h2 i {
margin-right: 10px; }
.info-panel .panel-heading {
display: flex; }
.info-panel .panel-heading i {
margin-right: 5px; }
.card-link:hover {
text-decoration: none; }
.card {
background: #fff;
border-radius: 5px;
color: #2C3E50;
display: flex;
transition: all 0.25s ease-out;
margin-bottom: 15px; }
.card:hover {
background: #ecf0f1; }
.card h3 {
margin-top: 0; }
.card .card-icon {
font-size: 26px;
border-radius: 5px 0 0 5px;
color: #fff;
margin: 0;
padding: 15px;
width: 60px;
display: flex;
justify-content: center; }
.card .card-icon_slideshows {
background-color: #512DA8; }
.card .card-icon_screens {
background-color: #C2185B; }
.card .card-icon_slides {
background-color: #1976D2; }
.card .card-icon_widgets {
background-color: #00796B; }
.card .card-body {
margin: 10px 15px; }
.card ul {
list-style-type: square;
padding-left: 20px; }
#app {
display: flex; }
body {
margin: 0;
padding: 0;
background-color: #E6E6E6; }
background-color: #e6e6e6; }
.ui-wrapper {
height: 100vh;
overflow-y: scroll;
padding: 50px 30px 0 30px; }
.navbar-inverse {
margin-left: 60px;
background-color: #373d47;
color: #18BC9C; }
.navbar-inverse a:hover {
background-color: #222222 !important; }
.navbar-inverse li a:hover {
background-color: #222222 !important; }
.navbar-inverse a:hover, .navbar-inverse .navbar-brand:hover {
color: #18BC9C !important; }
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
......@@ -23,70 +181,11 @@ body {
.navbar > .container-fluid a.navbar-brand:first-of-type {
margin-left: 0; } }
.ui-sidebar-container {
height: 100vh;
position: fixed;
background-color: #373d47;
width: 52px;
overflow: hidden;
z-index: 1900;
padding-top: 50px;
color: #979da7; }
.ui-sidebar-activate {
height: 100vh;
position: fixed;
width: 10px;
overflow: hidden;
z-index: 1901;
padding-top: 50px; }
.ui-sidebar {
width: 200px;
padding: 0px;
line-height: 40px; }
.ui-sidebar i {
padding-right: 20px; }
.ui-sidebar-wrapper {
margin-left: 52px;
position: relative;
padding-top: 50px; }
.ui-sidebar-container.ui-expanded {
width: 200px; }
.ui-sidebar-wrapper.ui-expanded {
margin-left: 200px; }
.ui-nav-light li {
background-color: #474d57; }
ul.nav.ui-nav a {
color: #979da7 !important;
padding: 0;
padding-left: 16px; }
.navbar-inverse span.navbar-brand:hover,
.navbar-inverse span.navbar-brand:focus {
background-color: transparent;
color: #999999; }
ul.nav.ui-nav li.active {
background-color: #474d57; }
.navbar-brand {
max-width: 500px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis; }
/*Styling for inline checkboxes and such */
table .checkbox {
display: table-cell; }
table .checkbox input[type=checkbox] {
table .checkbox input[type="checkbox"] {
margin-left: 10px; }
/*Styling for Layer Stuff*/
......@@ -102,10 +201,10 @@ table .checkbox input[type=checkbox] {
-webkit-border-radius: 6px 6px 6px 6px;
-moz-border-radius: 6px 6px 6px 6px;
border-radius: 6px 6px 6px 6px;
background-color: #FFFFFF; }
background-color: #ffffff; }
.itemContainerLayer {
background-color: #EEEEEE; }
background-color: #eeeeee; }
.itemContainerSlide {
background-color: #dfe6f6; }
......@@ -226,9 +325,6 @@ table .checkbox input[type=checkbox] {
.collapse:not(.in) {
display: none; }
.collapsed {
border-bottom: none; }
.slideTitle,
.slideshowTitle,
.screenTitle {
......
@import "variables";
// Import component styles
@import "components/sidebar";
@import "components/sidebar-item";
@import "components/page-header";
@import "components/info-panel";
@import "components/card";
#app {
display: flex;
}
body {
margin: 0;
padding: 0;
background-color: #e6e6e6;
}
.ui-wrapper {
height: 100vh;
overflow-y: scroll;
padding: 50px 30px 0 30px;
}
.navbar-inverse {
margin-left: $sidebar-width;
background-color: #373d47;
color: $brand-success;
a {
&:hover {
background-color: $gray-darker !important;
}
}
li {
a {
&:hover {
background-color: $gray-darker !important;
}
}
}
}
.navbar-inverse {
a, .navbar-brand {
&:hover {
color: $brand-success !important;
}
}
}
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -15px;
......@@ -33,77 +80,6 @@ body {
}
}
.ui-sidebar-container {
height: 100vh;
position: fixed;
background-color: #373d47;
width: 52px;
overflow: hidden;
z-index: 1900;
padding-top: 50px;
color: #979da7;
}
.ui-sidebar-activate {
height: 100vh;
position: fixed;
width: 10px;
overflow: hidden;
z-index: 1901;
padding-top: 50px;
}
.ui-sidebar {
width: 200px;
padding: 0px;
line-height: 40px;
}
.ui-sidebar i {
padding-right: 20px;
}
.ui-sidebar-wrapper {
margin-left: 52px;
position: relative;
padding-top: 50px;
}
.ui-sidebar-container.ui-expanded {
width: 200px;
}
.ui-sidebar-wrapper.ui-expanded {
margin-left: 200px;
}
.ui-nav-light li {
background-color: #474d57;
}
ul.nav.ui-nav a {
color: #979da7 !important;
padding: 0;
padding-left: 16px;
}
.navbar-inverse span.navbar-brand:hover,
.navbar-inverse span.navbar-brand:focus {
background-color: transparent;
color: #999999;
}
ul.nav.ui-nav li.active {
background-color: #474d57;
}
.navbar-brand {
max-width: 500px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
/*Styling for inline checkboxes and such */
table .checkbox {
display: table-cell;
......@@ -279,10 +255,6 @@ table .checkbox input[type="checkbox"] {
display: none;
}
.collapsed {
border-bottom: none;
}
.slideTitle,
.slideshowTitle,
.screenTitle {
......
This diff is collapsed.
......@@ -8,7 +8,7 @@
// Load core variables and mixins
// --------------------------------------------------
@import "variables";
@import "../variables";
@import "mixins";
......
@import "../variables";
.card-link:hover {
text-decoration: none;
}
.card {
background: #fff;
border-radius: 5px;
color: $brand-primary;
display: flex;
transition: all 0.25s ease-out;
margin-bottom: 15px;
&:hover {
background: $gray-lighter;
}
h3 {
margin-top: 0;
}
.card-icon {
font-size: 26px;
border-radius: 5px 0 0 5px;
color: #fff;
margin: 0;
padding: 15px;
width: 60px;
display: flex;
justify-content: center;
}
.card-icon_slideshows {
background-color: $brand-slideshows;
}
.card-icon_screens {
background-color: $brand-screens;
}
.card-icon_slides {
background-color: $brand-slides;
}
.card-icon_widgets {
background-color: $brand-widgets;
}
.card-body {
margin: 10px 15px;
}
ul {
list-style-type: square;
padding-left: 20px;
}
}
.info-panel {
.panel-heading {
display: flex;
i {
margin-right: 5px;
}
}
}
@import "../variables";
.pageheader {
margin-top: 36px;
margin-bottom: 36px;
position: relative;
display: flex;
justify-content: space-between;
box-shadow: 0px 0px 15px -12px rgba(0,0,0,0.75);
h2 {
margin: 0;
i {
margin-right: 5px;
}
}
}
@import "../variables";
.sidebar-item {
width: 60px;
transition: width 100ms ease-out;
cursor: pointer;
a {
color: #ffffff;
align-items: center;
display: flex !important;
height: $sidebar-width;
padding: 0 !important;
}
i {
color: $gray-lighter;
font-size: $font-size-large;
text-align: center;
width: $sidebar-width;
}
&.sidebar-section-expand {
margin-top: auto;
}
&.sidebar-section-close {
margin-top: auto;
}
a.active {
box-shadow: 0px 0px 28px -9px rgba(0,0,0,0.75);
}
&:hover {
width: auto;
box-shadow: 0px 0px 28px -9px rgba(0,0,0,0.75);
i {
color: #ffffff;
}
a:hover {
background-color: $gray-dark;
}
.sidebar-title {
display: block;
}
}
&.sidebar-section-home {
a:hover, a.active {
background-color: $brand-home;
}
}
&.sidebar-section-groups {
a:hover, a.active {
background-color: $brand-groups;
}
}
&.sidebar-section-screens {
a:hover, a.active {
background-color: $brand-screens