Skip to content

Commit

Permalink
Add layots
Browse files Browse the repository at this point in the history
  • Loading branch information
Sky161 committed Aug 18, 2016
1 parent 0a058d3 commit 1febe2c
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"globals"
],
"dependencies": {
"bootstrap-sass": "^3.3.7"
"normalize-scss": "^3.0.3"
}
}
29 changes: 26 additions & 3 deletions jade/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,30 @@ html(lang='ru')
link(rel="stylesheet", href="build.css")
script(src="build.js")
body
header
main.content
h1 Hello, world!
footer
header
h1 Выберите друзей
.container
.column#friends-vk
.search
label(for="search-friends").icon
input(type="text", id="search-friends", name="search-friends", placeholder="Начните вводить имя друга")
.list
.title Ваши друзья
ul
li
img(src="http://cdn.stripersonline.com/6/6f/50x50px-ZC-6f67bd7e_125x125px-LS-afddea1f_haha-lol-manolo-troll-troll-face-Favim_com-143216.jpeg")
p Имя Фамилия
span.add(title="Добавить в избранное")
.column#favorite
.search
input(type="text", name="search-favorite", placeholder="Название")
.list
.title Друзья в списке
ul
li
img(src="http://cdn.stripersonline.com/6/6f/50x50px-ZC-6f67bd7e_125x125px-LS-afddea1f_haha-lol-manolo-troll-troll-face-Favim_com-143216.jpeg")
p Имя Фамилия
span.remove(title="Удалить из избраного")
footer
button.btn Сохранить
15 changes: 10 additions & 5 deletions sass/main.sass
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@

@import "./variables"
@import "./mixins"
@import "../app/components/bootstrap-sass/assets/stylesheets/bootstrap"
@import "../app/components/normalize-scss/_normalize.scss"

html
width: 100%
min-height: 100%
width: 100%
height: 100%

*
box-sizing: border-box
body
width: 100%
min-width: 980px
max-width: 1980px

*
box-sizing: border-box

0 comments on commit 1febe2c

Please sign in to comment.