Skip to content

Commit

Permalink
new logo
Browse files Browse the repository at this point in the history
  • Loading branch information
DomonJi committed Jan 30, 2017
1 parent 484b94c commit edf6b16
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 27 deletions.
Binary file removed admin/src/assets/image/logo.png
Binary file not shown.
11 changes: 11 additions & 0 deletions admin/src/assets/image/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions admin/src/components/common/DraftEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ export default {
outline 0
&.btn-save
color #fff
background-color $green
border-color $green
background-color $purple
border-color $purple
&.btn-info
color #fff
background-color $grey
Expand All @@ -263,7 +263,7 @@ export default {
background-color white
border-color $grey
&:hover
border-color $green
border-color $purple
&.btn-cancel
color #fff
background-color $red
Expand Down Expand Up @@ -310,13 +310,13 @@ export default {
.iconfont
display none
&:hover
color $green
border-bottom 2px solid $green
color $purple
border-bottom 2px solid $purple
.iconfont
display inline
&.active
color $green
border-bottom 2px solid $green
color $purple
border-bottom 2px solid $purple
position relative
.search-list
position absolute
Expand All @@ -334,7 +334,7 @@ export default {
color $light
padding-left 4px
&:hover
color $green
color $purple
&+&
padding-top 10px
.delete-tag
Expand All @@ -350,13 +350,13 @@ export default {
.tag-input
border none
background transparent
color $green
color $purple
font-size 14px
outline 0
.image-input
border none
background transparent
color $green
color $purple
font-size 14px
outline 0
width 50vw
Expand Down Expand Up @@ -433,13 +433,13 @@ export default {
a
color $dark
&:hover
border-bottom 2px solid $green
border-bottom 2px solid $purple
h3
margin 3em 0 1.2em
position relative
&:before
content "#"
color $green
color $purple
position absolute
left -0.7em
top -2px
Expand All @@ -455,12 +455,12 @@ export default {
ul, ol
padding-left 1.5em
a
color $green
color $purple
font-weight 600
blockquote
margin 2em 0
padding-left 20px
border-left 4px solid $green
border-left 4px solid $purple
p
font-weight 600
margin-left 0
Expand Down
6 changes: 3 additions & 3 deletions admin/src/components/common/DraftList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default {
.draft-thumb
padding-left 5px
&.published
border-left 2px solid $green
border-left 2px solid $purple
&.updated
border-left 2px solid $yellow
.draft-title
Expand All @@ -64,10 +64,10 @@ export default {
padding-bottom 0
&.active
.draft-title
color $green
color $purple
&:hover
.draft-title
color $green
color $purple
.draft-content
color $light
font-size 12px
Expand Down
10 changes: 5 additions & 5 deletions admin/src/components/common/NavAside.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template lang="html">
<aside class="sidebar">
<img src="../../assets/image/logo.png" alt="" class="sidebar-logo">
<img src="../../assets/image/logo.svg" alt="" class="sidebar-logo">
<nav class="aside-nav">
<ul class="aside-nav-list">
<li class="aside-nav-item"><router-link class="aside-nav-button" to="/drafts"><i class="fa fa-file-text" aria-hidden="true"></i></router-link></li>
Expand Down Expand Up @@ -71,13 +71,13 @@ export default {
padding 12px 0 0 1px
border 1px solid $border
border-radius 50%
color $green
color $purple
&.router-link-active
border 1px solid $green
border 1px solid $purple
&:hover
color white
background $green
border 1px solid $green
background $purple
border 1px solid $purple
.iconfont
font-size 22px
.aside-menu
Expand Down
6 changes: 3 additions & 3 deletions admin/src/components/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ export default {
outline 0
&.btn-save
color #fff
background-color $green
border-color $green
background-color $purple
border-color $purple
&.btn-info
color #fff
background-color $grey
Expand All @@ -123,7 +123,7 @@ export default {
background-color white
border-color $grey
&:hover
border-color $green
border-color $purple
&.btn-cancel
color #fff
background-color $red
Expand Down
2 changes: 1 addition & 1 deletion admin/src/stylus/_settings.styl
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ $grey = #c4c4c4
$codebg = #f8f8f8
$red = #ff6666
$black = #4a4a4a

$purple = #b979b1
$radius = 2px
Binary file removed client/src/assets/logo.png
Binary file not shown.
11 changes: 11 additions & 0 deletions client/src/assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed client/src/assets/logo2.png
Binary file not shown.
13 changes: 13 additions & 0 deletions client/src/assets/monkov_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/src/components/HeaderBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ a.selector
color:white
.logo
background:url('../assets/logo_impreza.png') no-repeat center /contain
background:url('../assets/monkov_logo.svg') no-repeat center /contain
width:180px
@media (max-width: 901px)
width:120px
Expand Down

0 comments on commit edf6b16

Please sign in to comment.