Add styles from main content

Sky161 · Aug 18, 2016 · 074a8d6 · 074a8d6
1 parent 3d74b3f
commit 074a8d6
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 6 deletions.
diff --git a/app/fonts/firasans-light-webfont.eot b/app/fonts/firasans-light-webfont.eot
diff --git a/app/fonts/firasans-light-webfont.ttf b/app/fonts/firasans-light-webfont.ttf
diff --git a/app/fonts/firasans-light-webfont.woff b/app/fonts/firasans-light-webfont.woff
diff --git a/app/fonts/firasans-light-webfont.woff2 b/app/fonts/firasans-light-webfont.woff2
diff --git a/app/img/close.png b/app/img/close.png
diff --git a/app/img/pluse.png b/app/img/pluse.png
diff --git a/app/img/search.png b/app/img/search.png
diff --git a/jade/index.jade b/jade/index.jade
@@ -23,15 +23,51 @@ html(lang='ru')
 								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="Добавить в избранное")
+							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="Добавить в избранное")
+							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="Добавить в избранное")
+							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="Добавить в избранное")
+							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="Добавить в избранное")
+							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="Удалить из избраного")
+						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="Удалить из избраного")
+							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="Удалить из избраного")
+							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="Удалить из избраного")
+							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="Удалить из избраного")
+							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 Сохранить
diff --git a/sass/_fonts.sass b/sass/_fonts.sass
@@ -7,3 +7,4 @@
  */
 
 +fontAdd("firasansMedium", "firasans-medium-webfont")
++fontAdd("firasansLight", "firasans-light-webfont")
diff --git a/sass/main.sass b/sass/main.sass
@@ -52,7 +52,87 @@ html
 					font-weight: normal
 
 			.container
-				padding: 0 0 45px
+				font-size: 0
+
+				.column
+					width: 50%
+					font-size: 12px
+					display: inline-block
+					vertical-align: top
+
+					.search
+						background: #f0f0f0
+						position: relative
+						padding: 10px 16px
+
+						input
+							width: 100%
+							height: 26px
+							border: none
+							padding: 0 25px
+							color: #9f9f9f
+							border-radius: 12px
+							font-family: "firasansLight"
+							outline: none
+
+						.icon
+							+bg("search.png", no-repeat)
+							width: 13px
+							height: 15px
+							display: block
+							+absolute(16px, auto, auto, 22px)
+
+						#search-friends
+							padding-left: 28px
+
+					&:first-child
+						.list
+							border-right: 1px solid #f0f0f0
+
+					.list
+						height: 354px
+						overflow: auto
+						padding: 0 16px
+
+						.title
+							padding: 10px 0 1px
+
+						ul
+							+resetCss
+							list-style-type: none
+
+							li
+								display: flex
+								align-items: center
+								border-top: 1px solid #f0f0f0
+								height: 58px
+
+								&:hover
+									background: #f0f0f0
+									cursor: move
+									+transitionMixin(background)
+
+								img
+									border-radius: 100%
+									margin-right: 8px
+									margin-left: 5px
+
+								p
+									margin: 0
+
+								span
+									margin-left: auto
+									display: block
+									margin-right: 5px
+									cursor: pointer
+
+								.add
+									+bg("pluse.png", no-repeat)
+									+sizeMixin(16px)
+
+								.remove
+									+bg("close.png", no-repeat)
+									+sizeMixin(14px)
 
 			footer
 				width: 100%
@@ -71,3 +151,4 @@ html
 					border: none
 					border-radius: 10px
 					margin: 9px 5px 0 0
+					outline: none
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@
		*/

		+fontAdd("firasansMedium", "firasans-medium-webfont")
		+fontAdd("firasansLight", "firasans-light-webfont")