CodeCow/sharedrop
1
0
Fork 0
mirror of https://github.com/szimek/sharedrop.git synced 2026-06-13 21:03:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Maciej Jarczok 2014-05-03 17:57:38 +02:00
commit a5e33eff63
14 changed files with 74 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@ -55,7 +55,7 @@ module.exports = function (grunt) {
cssDir: '.tmp/styles',
fontsDir: 'app/fonts',
httpFontsDir: 'fonts',
httpImagesPath: '../images'
imagesDir: 'app/images'
}
},
dist: {
@ -64,7 +64,7 @@ module.exports = function (grunt) {
cssDir: '.tmp/styles',
fontsDir: 'dist/fonts',
httpFontsDir: 'fonts',
httpImagesPath: '../images',
imagesDir: 'app/images',
environment: 'production'
}
}

2
app/styles/_variables.sass
View File

@ -1,2 +0,0 @@
$blue: #0088cc
$green: #a4c540

24
app/styles/app.sass
View File

@ -1,13 +1,17 @@
@import compass/reset
@import compass/css3
@import variables
@import mixins
@import layout
@import modal
@import header
@import footer
@import users
@import media
@import popover
@import glyphicons-filetypes
@import base/variables
@import base/mixins
@import base/element_defaults
@import base/glyphicons_filetypes
@import modules/modules
@import modules/modal
@import modules/users
@import modules/popover
@import layout/header
@import layout/footer
@import layout/media

26
app/styles/base/_element_defaults.sass Normal file
View File

@ -0,0 +1,26 @@
*
+box-sizing(border-box)
&::before, &::after
+box-sizing(border-box)
html
height: 100%
font-family: $font-family
font-size: 10px
body
height: 100%
a
text-decoration: none
b, strong
font-weight: bold
input, select
font-family: $font-family
.invisible
height: 0
width: 0
opacity: 0

0
app/styles/_glyphicons-filetypes.sass → app/styles/base/_glyphicons_filetypes.sass
View File

2
app/styles/_mixins.sass → app/styles/base/_mixins.sass
View File

@ -12,7 +12,7 @@
outline: none
width: auto
cursor: pointer
font-family: Helvetica, Arial, sans-serif
font-family: $font-family
=circle($size)
display: inline-block

4
app/styles/base/_variables.sass Normal file
View File

@ -0,0 +1,4 @@
$font-family: "Helvetica Neue", sans-serif
$blue: #0088cc
$green: #a4c540

12
app/styles/_footer.sass → app/styles/layout/_footer.sass
View File

@ -17,21 +17,21 @@
.about
display: inline-block
font-size: 12px
font-size: 1.2rem
line-height: 1.4em
.cowbell-labs
position: absolute
left: 15px
bottom: 15px
font-size: 10px
font-size: 1rem
> a
display: inline-block
vertical-align: middle
margin: -1px 0 0 2px
width: 102px
height: 16px
background: transparent image-url("/images/cowbell-labs.svg") no-repeat center
background: transparent inline-image("cowbell-labs.svg") no-repeat center
.github
position: absolute
@ -39,7 +39,7 @@
bottom: 13px
width: 20px
height: 20px
background: transparent image-url("/images/github.svg") no-repeat center
background: transparent inline-image("github.svg") no-repeat center
.webrtc
position: absolute
@ -47,7 +47,7 @@
bottom: 17px
width: 72px
height: 12px
background: transparent image-url("/images/webrtc.png") no-repeat center
background: transparent inline-image("webrtc.png") no-repeat center
background-size: 71px 12px
.firebase
@ -56,5 +56,5 @@
bottom: 15px
width: 76px
height: 20px
background: transparent image-url("/images/firebase.png") no-repeat center
background: transparent inline-image("firebase.png") no-repeat center
background-size: 76px 20px

16
app/styles/_header.sass → app/styles/layout/_header.sass
View File

@ -6,7 +6,7 @@
width: 100%
height: 60px
background: transparent
color: #000
color: black
+user-select(none)
.logo
position: relative
@ -20,7 +20,7 @@
position: absolute
bottom: 0
left: 44px
font-size: 10px
font-size: 1rem
font-weight: bold
img
vertical-align: top
@ -32,12 +32,12 @@
> li
float: left
margin-left: 15px
font-size: 14px
font-size: 1.4rem
line-height: 30px
a
display: inline-block
transition: opacity .17s linear
color: #000
transition: opacity .2s linear
color: black
img
vertical-align: middle
&:hover
@ -49,11 +49,11 @@
.icon-circle
+circle(18px)
border: 1px solid #000
font-size: 12px
border: 1px solid black
font-size: 1.2rem
opacity: .18
margin-top: -2px
.sign
background: transparent image-url("/images/persona.svg") no-repeat left
background: transparent inline-image("persona.svg") no-repeat left
padding-left: 25px

12
app/styles/_media.sass → app/styles/layout/_media.sass
View File

@ -40,12 +40,12 @@
padding-left: 170px
width: 100%
.user-email
font-size: 14px
font-size: 1.4rem
.user-label
font-size: 18px
font-size: 1.8rem
.user-id
margin-top: 4px
font-size: 12px
font-size: 1.2rem
color: #808080
.popover
$bg_color: #f4f4f4
@ -86,7 +86,7 @@
height: 106px
line-height: 106px
width: 50%
font-size: 12px
font-size: 1.2rem
margin-left: -3px
color: #fff
&.cancel
@ -112,7 +112,7 @@
height: 100px
padding: 15px
.about
font-size: 11px
font-size: 1.1rem
.cowbell-labs
> span
display: none
@ -127,7 +127,7 @@
.error
width: auto
font-size: 14px
font-size: 1.4rem
padding: 0 15px

0
app/styles/_modal.sass → app/styles/modules/_modal.sass
View File

24
app/styles/_layout.sass → app/styles/modules/_modules.sass
View File

@ -1,22 +1,3 @@
*
+box-sizing(border-box)
&::before, &::after
+box-sizing(border-box)
html
height: 100%
font-family: "Helvetica Neue", sans-serif
font-size: 10px
body
height: 100%
a
text-decoration: none
b, strong
font-weight: bold
.preloader
position: absolute
left: 0
@ -40,11 +21,6 @@ b, strong
.preloader
opacity: 0
.invisible
height: 0
width: 0
opacity: 0
.error
position: absolute
top: 0

4
app/styles/_popover.sass → app/styles/modules/_popover.sass
View File

@ -26,7 +26,7 @@
> p
word-break: break-all
overflow: hidden
font-size: 12px
font-size: 1.2rem
line-height: 1.4em
margin-bottom: 1em
min-height: 28px
@ -34,7 +34,7 @@
position: absolute
left: 0
top: 0
font-size: 50px
font-size: 5rem
.popover-buttons
text-align: right

13
app/styles/_users.sass → app/styles/modules/_users.sass
View File

@ -45,12 +45,12 @@ $user-size: 76px
color: #606060
padding-bottom: 4px
.user-email
font-size: 10px
font-size: 1rem
+ellipsis
.user-label
font-size: 14px
font-size: 1.4rem
.user-id
font-size: 10px
font-size: 1rem
color: #808080
.user-connection-status
display: inline-block
@ -68,12 +68,11 @@ $user-size: 76px
select
+appearance(none)
border: none
font-size: 10px
font-family: "Helvetica Neue", sans-serif
font-size: 1rem
color: #808080
padding-right: 10px
outline: none
background: transparent image-url("/images/select-arrow.svg") no-repeat 66px 50%
background: transparent inline-image("select-arrow.svg") no-repeat 66px 50%
// firefox fix - remove arrow from select
text-indent: 0.01px
text-overflow: ''
@ -149,8 +148,6 @@ $user-size: 76px
&::after
opacity: 1
+keyframes(shadow)
0%
opacity: 0