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.

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

Flat styling #3

Merged
merged 2 commits into from
Dec 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
82 changes: 58 additions & 24 deletions src/cuisine.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
label.big.cuisine.heading,
label.cuisine.heading {
color: white;
margin: 0 20px 0 20px;
font-weight: bold;
font-size: 24pt;
margin: 32px 32px 0;
font-weight: normal;
font-size: 18pt;
}

label.big.cuisine,
label.cuisine {
border-width: 0;
color: white;
margin: 5px 20px 5px 20px;
font-size: 12pt;
margin: 0 32px 32px;
font-size: 11pt;

}

label.cuisine.heading.mediterranean,
Expand All @@ -21,25 +23,57 @@ label.cuisine.mediterranean {
.cuisine.view.tile {
background-repeat: no-repeat;
background-size: 100%;
background-position: 50%;
border-width: 0;
min-width: 396px; /* FIXME: avoid smaller columns */
}


.cuisine.view.tile.american {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/american.png');
}

.cuisine.view.tile.chinese {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/chinese.png');
}
.cuisine.view.tile.indian {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/indian.png');
}
.cuisine.view.tile.italian {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/italian.png');
}
.cuisine.view.tile.french {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/french.png');
}
.cuisine.view.tile.greek {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/greek.png');
}
.cuisine.view.tile.mexican {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/mexican.png');
}
.cuisine.view.tile.mediterranean {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/mediterranean.png');
}
.cuisine.view.tile.turkish {
background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.8)),
url('resource:/org/gnome/Recipes/turkish.png');
}

.cuisine.view.tile.american { background: url('resource:/org/gnome/Recipes/american.png'); }
.cuisine.view.tile.chinese { background: url('resource:/org/gnome/Recipes/chinese.png'); }
.cuisine.view.tile.indian { background: url('resource:/org/gnome/Recipes/indian.png'); }
.cuisine.view.tile.italian { background: url('resource:/org/gnome/Recipes/italian.png'); }
.cuisine.view.tile.french { background: url('resource:/org/gnome/Recipes/french.png'); }
.cuisine.view.tile.greek { background: url('resource:/org/gnome/Recipes/greek.png'); }
.cuisine.view.tile.mexican { background: url('resource:/org/gnome/Recipes/mexican.png'); }
.cuisine.view.tile.mediterranean { background: url('resource:/org/gnome/Recipes/mediterranean.png'); }
.cuisine.view.tile.turkish { background: url('resource:/org/gnome/Recipes/turkish.png'); }

.cuisine.big.view.tile.american { background: url('resource:/org/gnome/Recipes/big-american.png'); }
.cuisine.big.view.tile.chinese { background: url('resource:/org/gnome/Recipes/big-chinese.png'); }
.cuisine.big.view.tile.indian { background: url('resource:/org/gnome/Recipes/big-indian.png'); }
.cuisine.big.view.tile.italian { background: url('resource:/org/gnome/Recipes/big-italian.png'); }
.cuisine.big.view.tile.french { background: url('resource:/org/gnome/Recipes/big-french.png'); }
.cuisine.big.view.tile.greek { background: url('resource:/org/gnome/Recipes/big-greek.png'); }
.cuisine.big.view.tile.mexican { background: url('resource:/org/gnome/Recipes/big-mexican.png'); }
.cuisine.big.view.tile.mediterranean { background: url('resource:/org/gnome/Recipes/big-mediterranean.png'); }
.cuisine.big.view.tile.turkish { background: url('resource:/org/gnome/Recipes/big-turkish.png'); }
.cuisine.big.view.tile.american { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-american.png'); }
.cuisine.big.view.tile.chinese { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-chinese.png'); }
.cuisine.big.view.tile.indian { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-indian.png'); }
.cuisine.big.view.tile.italian { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-italian.png'); }
.cuisine.big.view.tile.french { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-french.png'); }
.cuisine.big.view.tile.greek { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-greek.png'); }
.cuisine.big.view.tile.mexican { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-mexican.png'); }
.cuisine.big.view.tile.mediterranean { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-mediterranean.png'); }
.cuisine.big.view.tile.turkish { background: linear-gradient(to bottom, transparent, rgba(0,0,0,0.5)),url('resource:/org/gnome/Recipes/big-turkish.png'); }

107 changes: 55 additions & 52 deletions src/recipes.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* headings on the recipes page */
label.heading {
font: 20px Cantarell;
padding: 20px 0 10px 0;
font: 16px Cantarell;
font-weight: bold;
padding: 20px 0 10px 0;
}

label.sidebar {
Expand All @@ -11,16 +12,16 @@ label.sidebar {
}

scrolledwindow.error {
border: 1px solid red;
background: red;
border: 1px solid red;
background: red;
}

box.searchbar {
border-bottom: 1px solid black;
border-bottom: 1px solid black;
}

button.circular.small {
padding: 0px;
padding: 0px;
}

image.checkmark.checked {
Expand All @@ -45,46 +46,48 @@ image.chef.circular {
}

.view.tile {
padding: 0;
box-shadow: inset 0 1px @theme_base_color, 0 1px 1px alpha(black,0.4);
border: 1px solid mix(@theme_base_color,@theme_fg_color,0.3);
padding: 0;
text-shadow: none;
border: 1px solid @borders;
background: #fff;
border-radius: 0;
}
.recipe.view.tile {
color: mix(@theme_base_color,@theme_fg_color,0.1);
background-image: -gtk-recolor(url('resource:///org/gnome/Recipes/org.gnome.Recipes-symbolic.symbolic.png'));
background-size: 100%;
background-position: 80px -80px;
color: mix(@theme_base_color,@theme_fg_color,0.1);
background-image: -gtk-recolor(url('resource:///org/gnome/Recipes/org.gnome.Recipes-symbolic.symbolic.png'));
background-size: 100%;
background-position: 80px -80px;
}

@define-color diet_tag_bg #cc1212;
@define-color diet_tag_fg #ffffff;

.diet-tag {
background-image: none;
background-color: @diet_tag_bg;
color: @diet_tag_fg;
background-image: none;
background-color: @diet_tag_bg;
color: @diet_tag_fg;

border-radius: 4px;
border-width: 0;
border-radius: 4px;
border-width: 0;

margin: 2px;
padding: 4px;
margin: 2px;
padding: 4px;
}

.diet-tag:hover {
background-color: shade(@diet_tag_bg, 1.10);
color: @diet_tag_fg;
background-color: shade(@diet_tag_bg, 1.10);
color: @diet_tag_fg;
}

.diet-tag.button,
.diet-tag.button:hover,
.diet-tag.button:active,
.diet-tag.button:active:hover {
background-color: transparent;
background-image: none;
box-shadow: none;
border-image: none;
border-width: 0;
background-color: transparent;
background-image: none;
box-shadow: none;
border-image: none;
border-width: 0;
}

.diet-tag.button:hover {
Expand All @@ -95,15 +98,15 @@ image.chef.circular {
@define-color meal_tag_fg #ffffff;

.meal-tag {
background-image: none;
background-color: @meal_tag_bg;
color: @meal_tag_fg;
background-image: none;
background-color: @meal_tag_bg;
color: @meal_tag_fg;

border-radius: 4px;
border-width: 0;
border-radius: 4px;
border-width: 0;

margin: 2px;
padding: 4px;
margin: 2px;
padding: 4px;
}

.meal-tag:hover {
Expand All @@ -115,11 +118,11 @@ image.chef.circular {
.meal-tag.button:hover,
.meal-tag.button:active,
.meal-tag.button:active:hover {
background-color: transparent;
background-image: none;
box-shadow: none;
border-image: none;
border-width: 0;
background-color: transparent;
background-image: none;
box-shadow: none;
border-image: none;
border-width: 0;
}

.meal-tag.button:hover {
Expand All @@ -130,15 +133,15 @@ image.chef.circular {
@define-color ingredient_tag_fg #ffffff;

.ingredient-tag {
background-image: none;
background-color: @ingredient_tag_bg;
color: @ingredient_tag_fg;
background-image: none;
background-color: @ingredient_tag_bg;
color: @ingredient_tag_fg;

border-radius: 4px;
border-width: 0;
border-radius: 4px;
border-width: 0;

margin: 2px;
padding: 4px;
margin: 2px;
padding: 4px;
}

.ingredient-tag:hover {
Expand All @@ -150,14 +153,14 @@ image.chef.circular {
.ingredient-tag.button:hover,
.ingredient-tag.button:active,
.ingredient-tag.button:active:hover {
background-color: transparent;
background-image: none;
box-shadow: none;
border-image: none;
border-width: 0;
background-color: transparent;
background-image: none;
box-shadow: none;
border-image: none;
border-width: 0;
}

.ingredient-tag.button:hover {
color: shade(@ingredient_tag_bg, 2.10);
color: shade(@ingredient_tag_bg, 2.10);
}