Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-15 15:44:31 +02:00
commit 1fe519142b
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/svg-dimensions.css
View file

@ -9,7 +9,7 @@
.icon-clock { width: 16px; height: 16px; } .icon-clock { width: 16px; height: 16px; }
.icon-cloud { width: 16px; height: 16px; } .icon-cloud { width: 16px; height: 16px; }
.icon-cog { width: 20px; height: 20px; } .icon-cog { width: 20px; height: 20px; }
.icon-crown { width: 64px; height: 48px; } .icon-crown { width: 62px; height: 27px; }
.icon-dashboard { width: 24px; height: 24px; } .icon-dashboard { width: 24px; height: 24px; }
.icon-diagonal-cross { width: 13px; height: 13px; } .icon-diagonal-cross { width: 13px; height: 13px; }
.icon-download { width: 14px; height: 13px; } .icon-download { width: 14px; height: 13px; }

15
app/assets/stylesheets/zammad.css.scss
View file

@ -2438,7 +2438,7 @@ footer {
justify-content: center; justify-content: center;
} }
.user-menu .list-button *:not(.dropdown-nose) { .user-menu .list-button *:not(.dropdown-nose):not(.icon-crown) {
position: relative; position: relative;
} }
@ -2547,8 +2547,9 @@ footer {
.icon-crown { .icon-crown {
position: absolute; position: absolute;
width: 32px; width: 32px;
left: -5px; left: 50%;
top: -23px; margin-left: -16px;
top: -15px;
fill: hsl(47,100%,59%); fill: hsl(47,100%,59%);
} }
@ -2558,8 +2559,8 @@ footer {
.icon-crown { .icon-crown {
width: 40px; width: 40px;
left: -6px; margin-left: -20px;
top: -24px; top: -15px;
} }
} }
@ -2569,8 +2570,8 @@ footer {
.icon-crown { .icon-crown {
width: 64px; width: 64px;
left: -10px; margin-left: -32px;
top: -23px; top: -16px;
} }
} }

BIN
contrib/icon-sprite.sketch
View file

Binary file not shown.

2
public/assets/images/icons.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

6
public/assets/images/icons/crown.svg
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="64px" height="48px" viewBox="0 0 64 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"> <svg width="62px" height="27px" viewBox="0 0 62 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch --> <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
<title>crown</title> <title>crown</title>
<desc>Created with Sketch.</desc> <desc>Created with Sketch.</desc>
<defs></defs> <defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage"> <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="crown" sketch:type="MSArtboardGroup" fill="#FFD22E"> <g id="crown" sketch:type="MSArtboardGroup" fill="#FFD22E">
<g id="Path-1-Copy-4" sketch:type="MSLayerGroup" transform="translate(32.557449, 24.195104) rotate(-24.000000) translate(-32.557449, -24.195104) translate(2.057449, 10.195104)"> <g id="Path-1-Copy-4" sketch:type="MSLayerGroup">
<path d="M58.2147896,5.21326472 L58.2147896,27.8040786 L2.60663237,27.8040786 L2.60663237,5.21326472 C1.40696294,5.21326472 0.434438722,4.2407405 0.434438722,3.04107108 C0.434438722,1.84140166 1.40696294,0.868877443 2.60663236,0.868877443 C3.80630178,0.868877443 4.778826,1.84140166 4.778826,3.04107108 C4.778826,3.93734113 4.23600703,4.70682902 3.46118916,5.03871468 L3.46118916,5.03871468 L16.5086717,15.6397942 L29.5561542,5.03871468 L29.5561542,5.03871468 C28.7813363,4.70682902 28.2385173,3.93734114 28.2385173,3.04107108 C28.2385173,1.84140166 29.2110415,0.868877443 30.410711,0.868877443 C31.6103804,0.868877443 32.5829046,1.84140166 32.5829046,3.04107108 C32.5829046,3.93734113 32.0400856,4.70682902 31.2652678,5.03871468 L44.3127503,15.6397942 L57.3602328,5.03871468 C56.5854149,4.70682902 56.0425959,3.93734114 56.0425959,3.04107108 C56.0425959,1.84140166 57.0151201,0.868877443 58.2147895,0.868877443 C59.414459,0.868877443 60.3869832,1.84140166 60.3869832,3.04107108 C60.3869832,4.2407405 59.414459,5.21326472 58.2147896,5.21326472 Z" id="crown" sketch:type="MSShapeGroup"></path> <path d="M59.010711,5.21118478 L59.010711,27 L3.01071097,27 L3.01071097,5.21326098 C3.00935173,5.21326347 3.00799219,5.21326472 3.00663237,5.21326472 C1.80696295,5.21326472 0.834438727,4.2407405 0.834438727,3.04107108 C0.834438727,1.84140166 1.80696295,0.868877443 3.00663237,0.868877443 C4.20630179,0.868877443 5.17882601,1.84140166 5.17882601,3.04107108 C5.17882601,3.82504745 4.76350568,4.51202056 4.1408832,4.89397222 L4.1408832,4.89397222 L17.010711,15.0740741 L29.8787586,4.89538029 L29.8787586,4.89538029 C29.25486,4.51371043 28.8385173,3.82601178 28.8385173,3.04107108 C28.8385173,1.84140166 29.8110415,0.868877443 31.010711,0.868877443 C32.2103804,0.868877443 33.1829046,1.84140166 33.1829046,3.04107108 C33.1829046,3.82601178 32.7665619,4.51371043 32.1426633,4.89538028 L45.010711,15.0740741 L57.837709,4.92785073 C57.1834699,4.55356836 56.7425959,3.84880554 56.7425959,3.04107108 C56.7425959,1.84140166 57.7151201,0.868877443 58.9147896,0.868877443 C60.114459,0.868877443 61.0869832,1.84140166 61.0869832,3.04107108 C61.0869832,4.20859887 60.1658728,5.16098979 59.010711,5.21118478 Z" id="crown" sketch:type="MSShapeGroup"></path>
</g> </g>
</g> </g>
</g> </g>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB