sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/crunchbutton/crunchbutton

Browse Source
This commit is contained in:
Daniel Camargo 2014-03-07 18:55:30 -03:00
commit 18b33773c9
4 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/views/default/seven/frontend/about.phtml
View File

@ -33,7 +33,7 @@
<br>Fav<span class="staff-orite">orite</span> beer: Oatmeal Stout
</p>
<p class="staff-content">
Entrepreneur, Yale grad, and other impresive stuff. He’s the boss, so he bosses us around.
Entrepreneur, Yale grad, and other impressive stuff. He’s the boss, so he bosses us around.
</p>
</div>
@ -59,7 +59,7 @@
<br>Fav<span class="staff-orite">orite</span> beer: Root Beer
</p>
<p class="staff-content">
Root Beer. We're not really sure what he does. But without him we're pretty sure we would be thrown into a state of chaos.
We're not really sure what he does. But without him we're pretty sure we would be thrown into a state of chaos.
</p>
</div>
@ -88,6 +88,19 @@
Part Brazilian, part super hero. When the day needs saving he saves it.
</p>
</div>
<div class="staff">
<div class="staff-tyler staff-image animated-resize"></div>
<h1>Tyler Wallace</h1>
<h2>Chief Condiments Officer</h2>
<p class="staff-favorite">
Fav<span class="staff-orite">orite</span> food: Bacon
<br>Fav<span class="staff-orite">orite</span> beer: Heineken
</p>
<p class="staff-content">
Actor, member of the national ski patrol and can drive cross country in 72 hours. Many talents. Lots to do.
</p>
</div>
<div class="about-join-bubble-wrap">
<div class="bubble-curved bubble-curved-green bubble-animated animated-resize">

3
www/assets/css/seven.css
View File

@ -2396,6 +2396,9 @@ sup {
.staff-daniel {
background: url(../images/micro/staff-daniel.png) no-repeat;
}
.staff-tyler {
background: url(../images/micro/staff-tyler.png) no-repeat;
}
.staff-image {
width: 9em;

45
www/assets/images/micro/back-location.svg
View File

@ -6,29 +6,28 @@
<g id="gyNqUs_1_">
<g>
<g>
<path opacity="0.14" stroke="#FFFFFF" stroke-width="4" stroke-miterlimit="10" enable-background="new " d="M333.996,475.998
c-23.496,0.003-47.024-0.742-70.476,0.271c-15.068,0.651-26.288-5.396-36.671-14.927c-15.568-14.289-28.36-30.847-39.968-48.408
c-1.807-2.732-1.918-4.909-0.128-7.724c14.075-22.123,29.553-43.122,48.745-61.143c5.684-5.337,12.693-8.017,20.475-8.026
c52.99-0.066,105.98-0.073,158.97-0.004c11.513,0.015,21.876,9.998,21.958,21.68c0.226,32.159,0.227,64.322,0.004,96.481
c-0.085,12.116-10.466,21.723-22.924,21.769C387.319,476.062,360.658,475.996,333.996,475.998z M264.849,398.965
c-0.466-0.014-0.933-0.024-1.398-0.039c0.053-3.32-0.088-6.658,0.21-9.956c0.327-3.614-1.539-3.966-4.461-3.971
c-2.828-0.005-4.181,0.521-4.129,3.796c0.179,11.461,0.041,22.927,0.108,34.391c0.008,1.312-0.844,3.42,1.332,3.666
c1.798,0.204,4.301,1.225,5.415-0.94c1.377-2.678,2.303-1.05,3.687-0.22c6.714,4.028,13.747,1.457,16.52-5.88
c1.528-4.044,1.259-8.194,0.766-12.305C281.685,397.418,273.565,393.631,264.849,398.965z M385.11,426.339
c-3.396-4.601-6.592-9.198-10.089-13.554c-1.734-2.16-1.521-3.57,0.336-5.441c3.088-3.113,5.94-6.461,8.963-9.787
c-11.166-3.637-13.695,6.803-20.306,11.527c0-7.062-0.166-13.643,0.071-20.208c0.114-3.157-0.95-4.06-3.971-3.866
c-2.479,0.159-4.425-0.123-4.36,3.521c0.212,11.812,0.103,23.629,0.061,35.444c-0.008,1.906,0.269,2.982,2.643,3.116
c3.878,0.218,6.535-0.195,5.608-5.15c-0.471-2.508-0.349-5.453,2.689-6.141c2.596-0.587,3.203,2.436,4.126,4.05
C374.019,425.336,377.803,428.941,385.11,426.339z M316.748,415.29c-0.01,0-0.021,0-0.028,0c0-2.663,0.12-5.331-0.022-7.986
c-0.367-6.753-2.909-9.352-9.573-10.607c-3.57-0.673-6.99-0.141-10.302,0.847c-1.414,0.421-4.646,0.014-3.346,3.441
c0.918,2.422,2.039,4.086,5.123,2.573c2.092-1.025,4.502-1.104,6.839-0.661c1.989,0.378,2.698,1.811,2.69,3.646
c-0.008,2.146-1.752,1.526-2.935,1.685c-2.636,0.354-5.349,0.366-7.909,1.006c-3.922,0.977-7.072,2.989-7.338,7.635
c-0.21,3.667,0.302,7.168,3.805,9.117c4.242,2.36,8.592,2.104,12.733-0.504c1.359-0.857,2.576-3.166,3.892,0.225
c0.872,2.247,3.222,1.357,4.885,1.188c2.259-0.23,1.385-2.293,1.449-3.616C316.839,420.619,316.748,417.953,316.748,415.29z
M324.395,412.417c0.138,11.912,9.421,18.331,20.333,14.294c3.473-1.285,3.604-3.854,2.876-6.369
c-0.907-3.142-2.974-0.373-4.353-0.123c-3.595,0.65-7.187,1.371-9.142-2.634c-1.918-3.931-1.927-8.219,0.432-11.943
c2.178-3.441,5.737-2.929,8.982-1.642c3.403,1.352,3.381-1.432,4.249-3.19c1.097-2.222-0.421-2.878-2.098-3.478
C334.009,393.167,324.252,400.077,324.395,412.417z"/>
<path opacity="0.14" enable-background="new " d="M333.996,475.998c-23.496,0.003-47.024-0.742-70.476,0.271
c-15.068,0.651-26.288-5.396-36.671-14.927c-15.568-14.289-28.36-30.847-39.968-48.408c-1.807-2.732-1.918-4.909-0.128-7.724
c14.075-22.123,29.553-43.122,48.745-61.143c5.684-5.337,12.693-8.017,20.475-8.026c52.99-0.066,105.98-0.073,158.97-0.004
c11.513,0.015,21.876,9.998,21.958,21.68c0.226,32.159,0.227,64.322,0.004,96.481c-0.085,12.116-10.466,21.723-22.924,21.769
C387.319,476.062,360.658,475.996,333.996,475.998z M264.849,398.965c-0.466-0.014-0.933-0.024-1.398-0.039
c0.053-3.32-0.088-6.658,0.21-9.956c0.327-3.614-1.539-3.966-4.461-3.971c-2.828-0.005-4.181,0.521-4.129,3.796
c0.179,11.461,0.041,22.927,0.108,34.391c0.008,1.312-0.844,3.42,1.332,3.666c1.798,0.204,4.301,1.225,5.415-0.94
c1.377-2.678,2.303-1.05,3.687-0.22c6.714,4.028,13.747,1.457,16.52-5.88c1.528-4.044,1.259-8.194,0.766-12.305
C281.685,397.418,273.565,393.631,264.849,398.965z M385.11,426.339c-3.396-4.601-6.592-9.198-10.089-13.554
c-1.734-2.16-1.521-3.57,0.336-5.441c3.088-3.113,5.94-6.461,8.963-9.787c-11.166-3.637-13.695,6.803-20.306,11.527
c0-7.062-0.166-13.643,0.071-20.208c0.114-3.157-0.95-4.06-3.971-3.866c-2.479,0.159-4.425-0.123-4.36,3.521
c0.212,11.812,0.103,23.629,0.061,35.444c-0.008,1.906,0.269,2.982,2.643,3.116c3.878,0.218,6.535-0.195,5.608-5.15
c-0.471-2.508-0.349-5.453,2.689-6.141c2.596-0.587,3.203,2.436,4.126,4.05C374.019,425.336,377.803,428.941,385.11,426.339z
M316.748,415.29c-0.01,0-0.021,0-0.028,0c0-2.663,0.12-5.331-0.022-7.986c-0.367-6.753-2.909-9.352-9.573-10.607
c-3.57-0.673-6.99-0.141-10.302,0.847c-1.414,0.421-4.646,0.014-3.346,3.441c0.918,2.422,2.039,4.086,5.123,2.573
c2.092-1.025,4.502-1.104,6.839-0.661c1.989,0.378,2.698,1.811,2.69,3.646c-0.008,2.146-1.752,1.526-2.935,1.685
c-2.636,0.354-5.349,0.366-7.909,1.006c-3.922,0.977-7.072,2.989-7.338,7.635c-0.21,3.667,0.302,7.168,3.805,9.117
c4.242,2.36,8.592,2.104,12.733-0.504c1.359-0.857,2.576-3.166,3.892,0.225c0.872,2.247,3.222,1.357,4.885,1.188
c2.259-0.23,1.385-2.293,1.449-3.616C316.839,420.619,316.748,417.953,316.748,415.29z M324.395,412.417
c0.138,11.912,9.421,18.331,20.333,14.294c3.473-1.285,3.604-3.854,2.876-6.369c-0.907-3.142-2.974-0.373-4.353-0.123
c-3.595,0.65-7.187,1.371-9.142-2.634c-1.918-3.931-1.927-8.219,0.432-11.943c2.178-3.441,5.737-2.929,8.982-1.642
c3.403,1.352,3.381-1.432,4.249-3.19c1.097-2.222-0.421-2.878-2.098-3.478C334.009,393.167,324.252,400.077,324.395,412.417z"/>
<path fill="#FFFFFF" d="M264.849,398.965c8.716-5.334,16.836-1.547,18.047,8.543c0.493,4.109,0.762,8.261-0.766,12.305
c-2.773,7.337-9.805,9.908-16.52,5.88c-1.383-0.83-2.309-2.458-3.687,0.22c-1.114,2.165-3.617,1.146-5.415,0.94
c-2.175-0.246-1.324-2.354-1.332-3.665c-0.067-11.465,0.071-22.931-0.108-34.392c-0.051-3.275,1.301-3.801,4.129-3.796

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
www/assets/images/micro/staff-tyler.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB