Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lumenwrites
lumenwrites committed Nov 13, 2017
1 parent fe9db04 commit 74d9573
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 33 deletions.
3 changes: 1 addition & 2 deletions client/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<html lang="en-US">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />

<!-- Meta -->
<title>Helix</title>
Expand Down
Binary file modified client/styles/.sass-cache/e61a59e4a8b712d77039b257901a5f046521ad92/style.scssc
View file
Binary file not shown.
74 changes: 43 additions & 31 deletions client/styles/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,42 +414,54 @@ header {
background: #282C37;
display: none;
}
/* line 19, ../sass/style.scss */
@media (max-width: 640px) {
/* line 14, ../sass/style.scss */
header {
width: 100%;
}
}
/* line 22, ../sass/style.scss */
header .logo {
float: left;
color: #9BAEC8;
line-height: 30px;
}
/* line 23, ../sass/style.scss */
/* line 26, ../sass/style.scss */
header .logo img {
width: 30px;
float: left;
margin-right: 4px;
}
/* line 29, ../sass/style.scss */
/* line 32, ../sass/style.scss */
header .main-menu {
float: right;
}
/* line 31, ../sass/style.scss */
/* line 34, ../sass/style.scss */
header .main-menu i {
line-height: 30px;
margin-right: 20px;
color: #9BAEC8;
}

/* line 42, ../sass/style.scss */
/* line 45, ../sass/style.scss */
.habits {
width: 640px;
margin: auto;
padding-top: 10px;
background: #282C37;
}
/* line 48, ../sass/style.scss */
@media (max-width: 640px) {
/* line 45, ../sass/style.scss */
.habits {
width: 100%;
}
}
/* line 55, ../sass/style.scss */
.habits .main-menu {
float: left;
margin-left: 10px;
}
/* line 51, ../sass/style.scss */
/* line 58, ../sass/style.scss */
.habits .main-menu i {
font-size: 18px;
margin-right: 4px;
Expand All @@ -458,61 +470,61 @@ header .main-menu i {
width: 200px;
height: 30px;
}
/* line 60, ../sass/style.scss */
/* line 67, ../sass/style.scss */
.habits .main-menu .dropdown {
float: left;
}
/* line 62, ../sass/style.scss */
/* line 69, ../sass/style.scss */
.habits .main-menu .dropdown .dropdown-menu {
margin-left: -10px;
background-color: #313543;
top: calc(100% - 1px);
padding: 0;
}
/* line 67, ../sass/style.scss */
/* line 74, ../sass/style.scss */
.habits .main-menu .dropdown .dropdown-menu li {
border-bottom: 1px solid rgba(0, 0, 0, 0.15);
margin: 0;
padding: 10px;
}
/* line 71, ../sass/style.scss */
/* line 78, ../sass/style.scss */
.habits .main-menu .dropdown .dropdown-menu li a {
color: #9BAEC8;
}
/* line 73, ../sass/style.scss */
/* line 80, ../sass/style.scss */
.habits .main-menu .dropdown .dropdown-menu li a i {
display: inline;
width: 20px;
margin-right: 10px;
}
/* line 87, ../sass/style.scss */
/* line 94, ../sass/style.scss */
.habits .calendar {
margin: 0 10px;
float: right;
position: relative;
}
/* line 92, ../sass/style.scss */
/* line 99, ../sass/style.scss */
.habits .calendar .prev-week, .habits .calendar .next-week {
display: none;
position: absolute;
height: 30px;
width: 0;
top: 0px;
}
/* line 98, ../sass/style.scss */
/* line 105, ../sass/style.scss */
.habits .calendar .prev-week .fa, .habits .calendar .next-week .fa {
line-height: 30px;
color: #9BAEC8;
}
/* line 103, ../sass/style.scss */
/* line 110, ../sass/style.scss */
.habits .calendar .prev-week {
left: -10px;
}
/* line 104, ../sass/style.scss */
/* line 111, ../sass/style.scss */
.habits .calendar .next-week {
right: 0px;
}
/* line 105, ../sass/style.scss */
/* line 112, ../sass/style.scss */
.habits .calendar .day {
float: left;
height: 30px;
Expand All @@ -522,21 +534,21 @@ header .main-menu i {
font-weight: bold;
position: relative;
}
/* line 112, ../sass/style.scss */
/* line 119, ../sass/style.scss */
.habits .calendar .day .name {
text-transform: uppercase;
font-size: 8px;
color: #9BAEC8;
/* font-family: 'Roboto Mono', sans-serif; */
/* font-weight: 800; */
}
/* line 119, ../sass/style.scss */
/* line 126, ../sass/style.scss */
.habits .calendar .day .date {
font-size: 15px;
line-height: 15px;
color: #9BAEC8;
}
/* line 126, ../sass/style.scss */
/* line 133, ../sass/style.scss */
.habits .calendar .day .today {
position: absolute;
top: -6px;
Expand All @@ -546,13 +558,13 @@ header .main-menu i {
border: 1px solid rgba(156, 175, 201, 0.4);
pointer-events: none;
}
/* line 140, ../sass/style.scss */
/* line 147, ../sass/style.scss */
.habits .habit {
padding: 10px;
margin: 2px 0;
background: #313543;
}
/* line 144, ../sass/style.scss */
/* line 151, ../sass/style.scss */
.habits .habit .streak {
float: left;
height: 40px;
Expand All @@ -564,17 +576,17 @@ header .main-menu i {
color: #9BAEC8;
margin-right: 10px;
}
/* line 155, ../sass/style.scss */
/* line 162, ../sass/style.scss */
.habits .habit .title {
float: left;
width: 20%;
padding: 10px 0;
}
/* line 160, ../sass/style.scss */
/* line 167, ../sass/style.scss */
.habits .habit .timeline {
float: right;
}
/* line 162, ../sass/style.scss */
/* line 169, ../sass/style.scss */
.habits .habit .timeline .checkmark {
float: left;
height: 40px;
Expand All @@ -585,25 +597,25 @@ header .main-menu i {
margin-right: 10px;
cursor: pointer;
}
/* line 171, ../sass/style.scss */
/* line 178, ../sass/style.scss */
.habits .habit .timeline .checkmark i {
line-height: 40px;
font-size: 20px;
color: #9BAEC8;
}
/* line 176, ../sass/style.scss */
/* line 183, ../sass/style.scss */
.habits .habit .timeline .checkmark .empty-day {
color: #9BAEC8;
}
/* line 179, ../sass/style.scss */
/* line 186, ../sass/style.scss */
.habits .habit .timeline .checkmark .fa-times {
color: #af6e6e;
}
/* line 182, ../sass/style.scss */
/* line 189, ../sass/style.scss */
.habits .habit .timeline .checkmark .fa-check {
color: #9dc89b;
}
/* line 185, ../sass/style.scss */
/* line 192, ../sass/style.scss */
.habits .habit .timeline .checkmark .fa-thumbs-up {
color: #cb9c6f;
}
7 changes: 7 additions & 0 deletions client/styles/sass/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ $heading: #3d454b;
/* Header */
header {
max-width: 640px;
@media (max-width: 640px) {
width: 100%;
}
margin: auto;
background: #282C37;
display:none;
Expand Down Expand Up @@ -41,6 +44,10 @@ header {

.habits {
width: 640px;
@media (max-width: 640px) {
width: 100%;
}

margin: auto;
padding-top: 10px;
background: #282C37;
Expand Down

0 comments on commit 74d9573

Please sign in to comment.