Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Little image adjustments #2

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f97035f
customization
Apr 6, 2015
8a661a6
Images adjustments
Apr 6, 2015
54bee29
Some cleaning and adjustments
Apr 7, 2015
ff8eea4
JS cleaning
Apr 9, 2015
1384a39
Images optimization
Apr 11, 2015
84c1429
Episode 3 update
Apr 11, 2015
d284a29
Trying to solve conflicts while merging.
Apr 11, 2015
acd7d55
Trying to solve conflicts while merging (II).
Apr 11, 2015
e287543
Trying to solve conflicts while merging (III).
Apr 12, 2015
c194132
cleaning
Apr 20, 2015
04f6a86
Update
Apr 20, 2015
f6257a7
Update
Apr 20, 2015
4d13b17
Episode 4 update
Apr 25, 2015
b052217
Episode 5 update
May 2, 2015
3bd228e
New models
May 2, 2015
2d03336
JS optimized
May 2, 2015
efc000b
CSS cleaning
May 2, 2015
a1a44d2
CSS optimized
May 2, 2015
c09ac02
Update
May 2, 2015
9b3cfd0
readme updates
May 2, 2015
5330612
readme updates
May 2, 2015
4cceb83
added a preloader
May 5, 2015
9033293
Images optimization
May 7, 2015
c26c669
JADE cleaning
May 7, 2015
3541982
CSS cleaning
May 7, 2015
e67abfc
readme updates
May 7, 2015
030f885
Episode 6 update
May 8, 2015
ee222d8
readme updates
May 8, 2015
9518543
JADE updated
May 9, 2015
8d74782
SASS updated
May 9, 2015
59f2b09
SASS customized
May 9, 2015
9c82a44
JS updated and customized
May 9, 2015
4926043
some adjustments
May 13, 2015
5b2015e
Episode 7 update
May 18, 2015
db42bb2
Episode 7 update (II)
May 18, 2015
0e378a5
Episode 8 update
May 23, 2015
3fb9314
Images updated
May 23, 2015
f951203
CSS updated
May 23, 2015
3373a0b
JS updated
May 23, 2015
c9dc18b
HTML updated
May 23, 2015
a442cfa
Trying to solve conflicts while merging.
May 23, 2015
709100a
Trying to solve conflicts while merging.
May 23, 2015
3a3bc61
Trying to solve conflicts while merging (II).
May 23, 2015
754d45d
Variables conflict fixed
May 23, 2015
cdc6914
Merge pull request #2 from LoogleeTk/personal
May 23, 2015
eea11cb
Trying to solve conflicts while merging.
May 24, 2015
f5bd363
Trying to solve conflicts while merging (II).
May 24, 2015
93a7261
Update readme.md
andrealeone Feb 3, 2016
f704f17
Update readme.md
andrealeone Feb 3, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ $RECYCLE.BIN/

# Windows shortcuts
*.lnk
css/skeleton.css
169 changes: 151 additions & 18 deletions css/layout1.sass
Original file line number Diff line number Diff line change
@@ -1,39 +1,50 @@
// Base Styles
@import vars

//

body
font-family: "Open Sans", sans-serif

h1
color: #ccc
weight: 300

font-size: 5rem
color: $title
weight: 400
margin-top: -25px
h2
font-size: 2.1rem
font-weight: 400
text-transform: uppercase
margin-top: -15px
figure
margin: auto

.content
position: relative
z-index: 2
background: white
margin-bottom: 250px
article
padding: 100px 0
padding: 100px 0 0 0
max-width: 640px
margin: 0 auto
text-align: center

img
max-width: 100%
.main-title
font-size: 6.3rem
margin-top: -40px
padding-top: 0px



// Parallax
//

.bird-box
position: relative
height: 600px
height: 780px
background:
image: url(/images/bird-bg.jpg)
size: auto 600px
size: auto 800px
position: top center
attachment: fixed
overflow: hidden

z-index: 3
.logo
height: 100px
width: 100%
Expand All @@ -44,7 +55,6 @@ img
position: absolute
top: 50%
margin-top: -50px

.fore-bird
width: 960px
height: 733px
Expand All @@ -54,9 +64,8 @@ img
position: right bottom
position: absolute
left: 50%
margin-left: -480px
top: 380px

margin-left: -285px
top: 300px
.back-bird
width: 960px
height: 298px
Expand All @@ -67,3 +76,127 @@ img
position: absolute
left: 50%
margin-left: -480px

//

.clothes-pics
margin-top: 40px
margin-bottom: 100px
figure
margin-bottom: 20px
position: relative
opacity: 0
transform: translateX(20px)
transition: all 0.3s ease-in-out
overflow: hidden
cursor: pointer
&.is-showing
opacity: 1
transform: translateX(0px)
img
display: block
transform: scale(1)
transition: all 0.3s ease-in-out
&:hover
figcaption
left: 0%
img
transform: scale(0.8)
figcaption
position: absolute
bottom: 10px
left: -100%
background: black
color: white
padding: 2px 8px
font-size: 11px
transition: all 0.3s ease-in-out

//

.large-window
height: 640px
background:
position: center 0px
attachment: fixed
margin-top: 100px
margin-bottom: 100px
border-radius: 50%
position: relative
cursor: pointer
.window-tint
background-color: rgba(0,0,0,0.5)
position: absolute
top: 0
left: 0
right: 0
bottom: 0
border-radius: 50%
display: flex
justify-content: center
align-items: center
opacity: 0
.promo-text
color: white
font-weight: 100
font-size: 50px
line-height: 1.2
strong
display: block
font-size: 30px
span
font:
weight: 300
size: 18px
style: italic
color: rgba(255,255,255,0.6)
a.window-cta
margin-top: 40px
font-size: 20px
text-decoration: none
color: white
border: 1px solid white
border-radius: 8%
padding: 10px 20px
transition: all 0.3s ease-in-out
&:hover
background: white
color: black

//

.blog-posts
margin-top: 0px
margin-bottom: 100px
.post
border: 1px solid $hr
margin-top: 40px
background: white
position: relative
.post-1
transform: translate(100px, 20px)
.post-2
z-index: 2
.post-3
transform: translate(-100px, 20px)
.post-4
margin: 25px 0 60px 0

//

footer
background: $text
color: white
padding: 40px 0
position: fixed
bottom: 0
width: 100%
.footer-stuff
max-width: 640px
margin: 0 auto
ul
padding-top: 20px
list-style-type: none
a
color: white
text-decoration: none
109 changes: 109 additions & 0 deletions css/layout2.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
@import vars

//

::selection
color: inherit
background: $primary-faded
::-moz-selection
color: inherit
background: $primary-faded
.h
-webkit-touch-callout: none
-webkit-user-select: none
-khtml-user-select: none
-moz-user-select: none
-ms-user-select: none
user-select: none
hr
border-top: 1px solid $hr
margin-top: 10px
margin-bottom: 15px
hr.solid
border-top: 1.5px solid $title-smooth
hr.dashed
border-top: 1.5px dashed $title-smooth

//

.cover-image
background-color: $primary-faded
.tile
width: 100%
height: 100%
h1
color: $title
font-family: "Open Sans", sans-serif
background: $primary-faded

//

.large-window.periscope-1
background-image: url(/images/model17.jpg)
background-position: top
margin-top: 40px
.large-window.periscope-2
background-image: url(/images/model11.jpg)
background-position: center
.large-window:hover
background:
color: $primary-faded
blend-mode: multiply

//

.post
padding: 10px 0px 10px 0px
h5
margin: 0px 0 10px 0
p
margin: 10px 0 10px 0
img
width: 100%
height: 100%
max-height: 100%
a
transition: 1s
font-size: 12px
text-decoration: none
color: $text
border: 1px solid $hr
border-radius: 8%
bottom: 0px
margin: 0 0 0 0
padding: 0 10 0 20
transition: all 0.3s ease-in-out
&:hover
transition: 1s
background: $primary-faded
border-color: $primary-faded
color: $text

//

footer
.columns.three
a
transition: 1s
padding-left: 20px
color: $primary-faded
&:hover
transition: 1s
color: $primary
.columns.six
padding: 45px 0 0 40px
input
color: $text
&:active
border-color: $primary
.button
transition: 1s
font-size: 12px
padding: 0 20px
background-color: $primary-faded
border-color: $text
color: white
&:hover
transition: 1s
background-color: $primary
color: white
Loading