Skip to content

Commit

Permalink
Merge b1270de into 20e021e
Browse files Browse the repository at this point in the history
  • Loading branch information
osteele committed May 26, 2018
2 parents 20e021e + b1270de commit 6a5ab5c
Show file tree
Hide file tree
Showing 10 changed files with 783 additions and 54 deletions.
49 changes: 40 additions & 9 deletions public/css/app.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "https://cdnjs.cloudflare.com/ajax/libs/foundation/6.4.3/css/foundation.min.css";
@import 'https://cdnjs.cloudflare.com/ajax/libs/foundation/6.4.3/css/foundation.min.css';
/*@import "../../node_modules/codemirror/lib/codemirror.css";*/

/** ----- Begin Global ----- **/
Expand All @@ -15,7 +15,7 @@ textarea::placeholder {
}

.button {
background-color: #009BDF;
background-color: #009bdf;
}

.align-right {
Expand Down Expand Up @@ -99,6 +99,15 @@ textarea::placeholder {
margin-bottom: 0;
}

.olin-build-logo {
color: #c7254e;
}

.olin-build-logo:hover {
color: #c7254e;
text-decoration: underline;
}

@media screen and (max-width: 700px) {
.app-sidebar {
left: -33.3%;
Expand Down Expand Up @@ -152,9 +161,9 @@ textarea::placeholder {

.header-content {
padding: 1.2em;
background-color: #009BDF;
background-color: #009bdf;
flex-basis: content;
width: 100%
width: 100%;
}

.olin-logo {
Expand All @@ -168,7 +177,7 @@ textarea::placeholder {
}

.olin-logo .beta-box {
fill: #FFC20E;
fill: #ffc20e;
}

.olin-logo .beta-text {
Expand Down Expand Up @@ -301,7 +310,7 @@ footer {
margin-bottom: 0.2em;
}

@media screen and (max-width:400px) {
@media screen and (max-width: 400px) {
.app-sidebar {
font-size: 80%;
}
Expand Down Expand Up @@ -505,14 +514,14 @@ span.label {
.m-input-moment .options button.is-active,
.m-calendar .toolbar button,
.content-container button:not(.im-btn .label) {
background-color: #009BDF;
background-color: #009bdf;
}

.page-title>.menu-icon-button {
position: relative;
z-index: 20;
cursor: pointer;
margin-right: .5em;
margin-right: 0.5em;
}

.page-title>.menu-icon-button>.menu-icon {
Expand Down Expand Up @@ -703,7 +712,7 @@ textarea.markdown-editor {
font-size: 1em;
}

.radio-option input[type=radio] {
.radio-option input[type='radio'] {
margin: 0;
}

Expand Down Expand Up @@ -742,3 +751,25 @@ textarea.markdown-editor {
}

/** ----- End View ----- **/

/* From https://www.w3schools.com/howto/howto_css_loader.asp */

.loading {
border: 16px solid #f3f3f3;
border-top: 16px solid #3498db;
border-radius: 50%;
width: 120px;
height: 120px;
animation: spin 2s linear infinite;
color: white;
margin: auto;
}

@keyframes spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
Loading

0 comments on commit 6a5ab5c

Please sign in to comment.