krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Oct 3 fixes (#9148)

Browse Source 
* Only show level after yesterdailies modal

* Fixed zindex

* Added spcial spells to rewards column

* Added single click buy for health and armoire

* Prevented task scoring when casting a spell

* Renamed generic purchase method

* Updated nav for small screen

* Hide checklist while casting
This commit is contained in:
Keith Holliday
2017-10-03 16:33:01 -05:00
committed by GitHub
parent 4fa3046104
commit 0aa16d7021
8 changed files with 246 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
website/client/components/appMenu.vue
View File

@@ -3,9 +3,10 @@ div
inbox-modal
creator-intro
profile
nav.navbar.navbar-inverse.fixed-top.navbar-toggleable-lg
nav.navbar.navbar-inverse.fixed-top.navbar-toggleable-md
.navbar-header
.logo.svg-icon(v-html="icons.logo")
.logo.svg-icon.hidden-lg-down(v-html="icons.logo")
.svg-icon.gryphon.hidden-xl-up
b-collapse#nav_collapse.collapse.navbar-collapse(is-nav)
ul.navbar-nav.mr-auto
router-link.nav-item(tag="li", :to="{name: 'tasks'}", exact)
@@ -93,58 +94,34 @@ div
@import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/utils.scss';
/* Less than Desktops and laptops ----------- */
@media only screen and (max-width : 1224px) {
#nav_collapse {
background: $purple-100;
margin-top: 1em;
margin-left: 70%;
padding-bottom: 1em;
a {
padding: .5em !important;
}
}
.dropdown-menu {
position: absolute !important;
left: -10em;
top: -.5em;
}
}
@media only screen and (max-width : 1224px) and (min-width: 1200px) {
#nav_collapse {
margin-top: 37em !important;
a {
width: 100%;
}
}
.navbar-collapse.collapse {
display: none !important;
}
.navbar-collapse.collapse.show {
display: block !important;
}
.navbar-toggler, .navbar-nav {
display: block;
}
.navbar-toggleable-lg .navbar-collapse {
display: block;
}
}
@media only screen and (max-width: 1280px) {
.nav-link {
padding: .8em 1em !important;
}
}
@media only screen and (max-width: 1200px) {
.navbar-header {
margin-right: 0px;
}
.gryphon {
background-image: url('~assets/images/melior@3x.png');
width: 30px;
height: 30px;
background-size: cover;
color: $white;
margin: 0 auto;
}
}
@media only screen and (max-width: 990px) {
#nav_collapse {
margin-top: 1.3em;
background-color: $purple-200;
}
}
nav.navbar {
background: $purple-100 url(~assets/svg/for-css/bits.svg) right no-repeat;
padding-left: 25px;