Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Striped style to weekly menu #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added Striped style to weekly menu #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
226 changes: 117 additions & 109 deletions app/sass/partials/_dish.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,134 +61,142 @@

// .ui.segment {
// padding: 0.4em;
// }
.card .content .ui.button {
font-size: 0.7rem;
}
// }
.card .content .ui.button {
font-size: 0.7rem;
}

//overide default tab style
.ui.pointing.secondary.menu
.item{
//overide default tab style
.ui.pointing.secondary.menu
.item{
color:$color_grey;
width:50%;
text-align:center;
border-radius:0;
&:hover{
color:$color_grey;
width:50%;
text-align:center;
border-radius:0;
&:hover{
color:$color_grey;
}
}
.active.item{
border-left:none;
border-color:$color_red;
}
.dishinfo{
.item{
color:$color_lgreen;
font-size:$sm;
}
}
@mixin transition($a) {
-webkit-transition : all $a ease 0s;
-moz-transition : all $a ease 0s;
-o-transition : all $a ease 0s;
transition : all $a ease 0s;
}
.active.item{
border-left:none;
border-color:$color_red;
}
.dishinfo{
.item{
color:$color_lgreen;
font-size:$sm;
}
}
@mixin transition($a) {
-webkit-transition : all $a ease 0s;
-moz-transition : all $a ease 0s;
-o-transition : all $a ease 0s;
transition : all $a ease 0s;
}

/* Transform Translate Mixin */
@mixin transfom-translate($b, $c){
-webkit-transform: translate($b, $c);
-ms-transform: translate($b, $c);
transform: translate($b, $c);
}
.header-week {
position: relative;
display: block;
margin: 30px auto;
width: 100%;
text-align: center;
&:before {
content: '';
position: absolute;
width: 50%;
height: 1px;
top: 50px;
left: 0;
bottom: 0;
right: 0;
margin: auto;
background-color: $color_lgrey;
}

/* Transform Translate Mixin */
@mixin transfom-translate($b, $c){
-webkit-transform: translate($b, $c);
-ms-transform: translate($b, $c);
transform: translate($b, $c);
&:after {
content: '';
position: absolute;
width:40px;
height: 3px;
top:47px;
left: 0;
right: 0;
bottom: 0;
margin: auto;
background-color: $color_yellow;
@include transition(0.3s);
}
.header-week {
position: relative;
display: block;
margin: 30px auto;
width: 100%;
text-align: center;
&:before {
content: '';
position: absolute;
width: 50%;
height: 1px;
top: 50px;
left: 0;
bottom: 0;
right: 0;
margin: auto;
background-color: $color_lgrey;
}

&:hover {
&:after {
content: '';
position: absolute;
width:40px;
height: 3px;
top:47px;
left: 0;
right: 0;
bottom: 0;
margin: auto;
background-color: $color_yellow;
@include transition(0.3s);
}

&:hover {
&:after {
width: 50px;
}
width: 50px;
}
}
}


.menu-dishinfo{
.content{
font-size:$sm;
.green{
color:$color_lgreen;
}
.yellow{
color:$color_yellow;
}
.menu-dishinfo{
.content{
font-size:$sm;
.green{
color:$color_lgreen;
}
.yellow{
color:$color_yellow;
}
}
}

.tab-dish-detail{
border:none;
margin-bottom:0 !important;
}
.tab-dish-detail{
border:none;
margin-bottom:0 !important;
}

.dish-detail{
line-height:1.2;
}
.dish-intro{
font-size:$sm;
color:$color-grey;
}
.dish-ingredients {
font-size:$xsm;
color:$color-grey;
margin-top:15px;
.header{
color:$color_dgrey;
}
.dish-detail{
line-height:1.2;
}
.dish-intro{
font-size:$sm;
color:$color-grey;
}
.dish-ingredients {
font-size:$xsm;
color:$color-grey;
margin-top:15px;
.header{
color:$color_dgrey;
}
.restaurantInfo{
font-size:$sm;
color:$color-grey;
.header{
color:$color_dgrey;
font-size:$md;
}
}
.restaurantInfo{
font-size:$sm;
color:$color-grey;
.header{
color:$color_dgrey;
font-size:$md;
}
}

.extra.content.horizontal.segments {
padding:0;
& span {
width:100%;
text-align:center;
}
.extra.content.horizontal.segments {
padding:0;
& span {
width:100%;
text-align:center;
}
}
}


.striped {
background: repeating-linear-gradient(
45deg,
$color_lgrey,
$color_lgrey 10px,
white 10px,
white 20px
);
}
5 changes: 5 additions & 0 deletions app/stylesheets/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
text-align: center;
}

/* line 194, ../sass/partials/_dish.scss */
.striped {
background: repeating-linear-gradient(45deg, #f7f7f7, #f7f7f7 10px, white 10px, white 20px);
}

/* line 3, ../sass/partials/_home.scss */
.column {
padding-bottom: 1rem;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/home/weeklyMenuTemplate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<a class="item" data-tab="second"><%= weeks[1] %></a>
<a class="item" data-tab="third"><%= weeks[2] %></a>
</div>
<div class="ui grid active tab" data-tab="first">
<div class="ui grid active tab striped" data-tab="first">
<h3 class="header-week">
Monday
</h3>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/status/statusTemplate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ <h1 class="ui small center aligned header">Where is the delivery man?</h1>

<div id="mapHolder" class="ui segment" style="height: 300px">

</div>
</div>