chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Design improvements

Browse source
This commit is contained in:
Christoph Haas 2018-05-30 20:11:33 +02:00
parent 800e2ac979
commit fa9bcbcab3
3 changed files with 74 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

53
app/assets/stylesheets/customisations.scss
View file

@ -62,18 +62,19 @@ body
} }
} }
.top-bar-left .sitename .top-bar-left .menu .menu-text
{ {
// Display the site name in a larger font // Display the site name in a larger font
font-size: 26px; font-size: 26px;
padding: 8px 5px 3px 0; padding: 8px 5px 3px 0;
color: $dark-gray; color: $dark-gray;
font-weight: normal;
// Extra space around the Linux distribution's logo // Extra space around the Linux distribution's logo
img // img
{ // {
padding: 0 5px; // padding: 0 5px;
} // }
} }
@ -99,28 +100,28 @@ body
// ---------------------------------- // ----------------------------------
.top-bar-right .menu li a // .top-bar-right .menu li a
{ // {
padding-top: 1.3rem; // padding-top: 1.3rem;
padding-bottom: 1.3rem; // padding-bottom: 1.3rem;
} // }
.top-bar // .top-bar
{ // {
// Draw a colored line below the navigation topbar // // Draw a colored line below the navigation topbar
border-bottom: 5px solid $debian_color; // border-bottom: 5px solid $debian_color;
color: #8a8a8a; // color: #8a8a8a;
a // a
{ // {
color: #8a8a8a; // color: #8a8a8a;
} // }
a.active // a.active
{ // {
color: #fefefe; // color: #fefefe;
} // }
} // }
// ------- Footer - format as table cell to allow vertical centering // ------- Footer - format as table cell to allow vertical centering
/*@import "compass/layout/sticky-footer";*/ /*@import "compass/layout/sticky-footer";*/
@ -406,7 +407,9 @@ a.black
*/ */
.menu .menu-text { .menu .menu-text {
font-size: 2.5rem; font-size: 2rem;
font-weight: 100;
}
// Nicer callouts // Nicer callouts
// https://foundation.zurb.com/building-blocks/blocks/alert-callout-subtle.html // https://foundation.zurb.com/building-blocks/blocks/alert-callout-subtle.html

88
app/views/layouts/_topbar.slim
View file

@ -1,45 +1,45 @@
.top-bar nav.top-bar
.top-bar-left .top-bar-left
ul.menu ul.menu
li.menu-text li.menu-text
a href='/' a href='/'
// TODO: Make the logo depend on the virtual host // TODO: Make the logo depend on the virtual host
img src="/images/logos/debian.svg" width="35" alt="Debian logo" img src="/images/logos/debian.svg" width="35" alt="Debian logo"
// TODO: Use proper distribution name // TODO: Use proper distribution name
' Debian Screenshots > ' Debian Screenshots >
.top-bar-right .top-bar-right
ul.dropdown.menu data-dropdown-menu=true ul.dropdown.menu data-dropdown-menu=true
li class=('active' if controller_name=='welcome' and action_name=='home') li class=('active' if controller_name=='welcome' and action_name=='home')
a href="/" Home a href="/" Home
li class=('active' if controller_name=='packages') li class=('active' if controller_name=='packages')
a href="/packages" Explore a href="/packages" Explore
//li.has-dropdown //li.has-dropdown
//a href="#" Distributions //a href="#" Distributions
//ul.dropdown //ul.dropdown
//// TODO: Use proper distribution list //// TODO: Use proper distribution list
//li //li
//a href="#" Debian //a href="#" Debian
//li //li
//a href="#" Ubuntu //a href="#" Ubuntu
li class=('active' if controller_name=='welcome' and action_name=='about') li class=('active' if controller_name=='welcome' and action_name=='about')
a href="/about" About a href="/about" About
// Add link if user has uploaded screenshots // Add link if user has uploaded screenshots
- if @current_users_screenshots and @current_users_screenshots.any? - if @current_users_screenshots and @current_users_screenshots.any?
li class=('active' if controller_name=='my' and action_name=='uploads') li class=('active' if controller_name=='my' and action_name=='uploads')
= link_to my_uploads_path = link_to my_uploads_path
' My uploads ' My uploads
span.badge.secondary span.badge.secondary
= @current_users_screenshots.count = @current_users_screenshots.count
// TODO: Check correct classes in Zurb/Foundation for top bar! // TODO: Check correct classes in Zurb/Foundation for top bar!
- if user_signed_in? and current_user.is_admin? - if user_signed_in? and current_user.is_admin?
li li
a href='#' Admin a href='#' Admin
/ ul.menu.vertical / ul.menu.vertical
/ li = link_to 'Moderate', moderate_path / li = link_to 'Moderate', moderate_path
/ li = link_to 'Logs', logs_path / li = link_to 'Logs', logs_path
li class=('active' if controller_name=='my') li class=('active' if controller_name=='my')
- if user_signed_in? - if user_signed_in?
= link_to "My", my_profile_path = link_to "My", my_profile_path
- else - else
= link_to 'Login', new_user_session_path = link_to 'Login', new_user_session_path

4
app/views/layouts/application.html.slim
View file

@ -13,8 +13,8 @@ html
= csrf_meta_tags = csrf_meta_tags
body body
// TODO: move topbar somewhere else than packages .container
= render 'layouts/topbar' = render 'layouts/topbar'
#content #content
#messages.row #messages.row
= render 'layouts/messages' = render 'layouts/messages'