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

Client Redesign: Inventory pages, secondary menu, misc css and design items (#8631)

Browse Source 
* add colors palette

* add secondary menu component and style it

* add box shadow to secondary menu

* misc css, fixes for secondary menu

* client: add equipment page with grouping, css: add some styles

* add typography

* more equipment

* stable: fix linting

* equipment: add styles (lots of general styles too)

* remove duplicate google fonts loading

* add dropdowns

* design: white search input background, remove gray from items

* start adding drawer and selected indicator

* wip equipment

* fix equipment

* equipment: correctly bind new properties on items.gear.equipped

* equipment: fix vue binding. version 2

* equipment: fix vue binding. version 3

* back to first fix for equip op, fix for sourcemaps, send http request when an item is equipped, load bootstrap-vue components where needed

* checkboxes and radio buttons

* correctly renders selected items in first postion during the first render

* add search

* general changes, constants part of app state, add popovers

* add toggle switch, rename css

* correct offset

* upgrade deps

* upgrade deps

* drawer and lot of other work

* update equipping mechanism

* finish equipment

* fix compilation and upgrade deps

* use v-show in place of v-if to fix ui issues

* v-show -> v-if

* fix linting in test/client

* fix es6 compilation in test/client

* fix babel compilation for tests

* fix groupsUtilities mixin tests

* client: buttons

* client: buttons: fix colors

* client: finish buttons and dropdowns

* upgrade bootstrap-vue, finish buttons and dropdowns

* fix tasks page layout

* misc fixes for buttons

* add textareas

* fix app menu

* add inputs

* fixes for toggleSwitch

* typography

* checkboxes and radio buttons

* add checkbox icon

* fix equip.js

* extract strings to newClient.json

* add Popover above 'Use Costume' / 'Auto Equip' slider - disable item select if costume-mode and 'useCostume' isn't active

* show "you have disabled your costume" error above the drawer items

* check errorMessage for null

* hide star if costume not enabled

* fix errorMessage (!errorMessage seems not to work for string)

* show minimize / expand icon - always centered by css

* drawer test

* drawer: fix centering on large screens

* fix show more button

* add margin when two dropdowns are next to each other

* adjust the page padding based on the drawer, misc fixes

* drawer fixes
This commit is contained in:
Matteo Pagliazzi
2017-05-16 21:09:55 +02:00
committed by GitHub
parent 1de379a2c3
commit 0af1203832
52 changed files with 3395 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,10 @@ nav.navbar.navbar-inverse.fixed-top.navbar-toggleable-sm
</template>
<style lang="scss" scoped>
@import '~client/assets/scss/colors.scss';
nav.navbar {
background: #432874 url(~assets/header/png/bits.png) right no-repeat;
background: $purple-100 url(~assets/header/png/bits.png) right no-repeat;
padding: 0 1.5rem;
height: 56px;
}
@@ -66,26 +68,26 @@ nav.navbar {
}
}
$active-purple: #6133b4;
.nav-item {
.nav-link {
color: #fff;
font-size: 16px;
color: $white;
font-weight: bold;
line-height: 1.5;
padding: 1rem 1.5rem;
transition: none;
}
&:hover {
.nav-link {
color: #fff;
background: $active-purple;
color: $white;
background: $purple-300;
}
}
&.active,&:hover {
.nav-link {
box-shadow: 0px -4px 0px #6133b4 inset;
box-shadow: 0px -4px 0px $purple-300 inset;
}
}
}
@@ -97,25 +99,38 @@ $active-purple: #6133b4;
}
.dropdown-menu:not(.user-dropdown) {
background: $active-purple;
background: $purple-300;
border-radius: 0px;
border: none;
box-shadow: none;
padding: 0px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
.dropdown-item {
color: #fff;
font-size: 16px;
box-shadow: none;
color: $white;
border: none;
&.active {
background: $active-purple;
background: $purple-300;
}
&:hover {
background: #4f2a93;
background: $purple-200;
&:last-child {
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
}
}
}
}
.item-with-icon {
color: #fff;
color: $white;
font-weight: bold;
padding: 0.75rem 0;
padding-left: 1rem;