cleanup new label ・ 8e375a6 ・ Gitprep

- cleanup new label;
- Browse files
- Yuki Kimoto commited on 2016-07-27
- 1 parent ad79f9b
  
  commit 8e375a6c8efbab414f25d85ce07332e8f3e6b3c5

Showing 2 changed files with 20 additions and 7 deletions

+2 -3

public/css/common.css

@@ -144,7 +144,7 @@
   display:inline-block;
 }
 .issues-labels a {
-  padding:5px 10px;
+  padding:7px 10px;
   display:inline-block;
   width:100%;
 }
@@ -562,13 +562,12 @@ input[type=text], input[type=password] {
   display:block;
   width:100%;
   text-decoration:none;
-  padding:8px 11px 7px 11px;
+  padding:10px 15px 8px 15px;
   text-align:center;
   color:#565656;
 }
 
 .project-tabs li.active a {
-  padding:5px 11px 7px 11px;
 }
 
 .admin-users {

+18 -4

templates/labels.html.ep

View

@@ -15,24 +15,38 @@
   layout 'common', title => "Labels - $user_id/$project_id";
 %>
 
+%= javascript begin
+  $(document).ready(function () {
+    $('.labels-new-btn').on('click', function () {
+      $('.labels-create-panel').toggle();
+    });
+  });
+  
+  $(document).ready(function () {
+    $('.labels-create-cancel-btn').on('click', function () {
+      $('.labels-create-panel').hide();
+    });
+  });
+% end
+
 %= include '/include/header';
 
 <div class="container">
   <div class="labels-new-panel">
-    <div class="btn btn-success">
+    <div class="labels-new-btn btn btn-success">
       New label
     </div>
   </div>
-  <form class="labels-create-panel" action="<%= url_for %>" method="post">
+  <form class="labels-create-panel" action="<%= url_for %>" method="post" style="display:none">
     <div class="labels-create-left">
       <%= input_tag 'label-id', class => 'labels-create-label-id' %>
       <%= input_tag 'color', class => 'labels-create-label-color' %>
     </div>
     <div class="labels-create-right">
-      <div class="btn">
+      <div class="labels-create-cancel-btn btn">
         Cancel
       </div>
-      <div class="btn btn-success">
+      <div class="labels-create-create-btn btn btn-success">
         Create label
       </div>
     </div>

...	...	@@ -144,7 +144,7 @@
144	144	display:inline-block;
145	145	}
146	146	.issues-labels a {
147		- padding:5px 10px;
	147	+ padding:7px 10px;
148	148	display:inline-block;
149	149	width:100%;
150	150	}
...	...	@@ -562,13 +562,12 @@ input[type=text], input[type=password] {
562	562	display:block;
563	563	width:100%;
564	564	text-decoration:none;
565		- padding:8px 11px 7px 11px;
	565	+ padding:10px 15px 8px 15px;
566	566	text-align:center;
567	567	color:#565656;
568	568	}
569	569
570	570	.project-tabs li.active a {
571		- padding:5px 11px 7px 11px;
572	571	}
573	572
574	573	.admin-users {

...	...	@@ -15,24 +15,38 @@
15	15	layout 'common', title => "Labels - $user_id/$project_id";
16	16	%>
17	17
	18	+%= javascript begin
	19	+ $(document).ready(function () {
	20	+ $('.labels-new-btn').on('click', function () {
	21	+ $('.labels-create-panel').toggle();
	22	+ });
	23	+ });
	24	+
	25	+ $(document).ready(function () {
	26	+ $('.labels-create-cancel-btn').on('click', function () {
	27	+ $('.labels-create-panel').hide();
	28	+ });
	29	+ });
	30	+% end
	31	+
18	32	%= include '/include/header';
19	33
20	34	<div class="container">
21	35	<div class="labels-new-panel">
22		- <div class="btn btn-success">
	36	+ <div class="labels-new-btn btn btn-success">
23	37	New label
24	38	</div>
25	39	</div>
26		- <form class="labels-create-panel" action="<%= url_for %>" method="post">
	40	+ <form class="labels-create-panel" action="<%= url_for %>" method="post" style="display:none">
27	41	<div class="labels-create-left">
28	42	<%= input_tag 'label-id', class => 'labels-create-label-id' %>
29	43	<%= input_tag 'color', class => 'labels-create-label-color' %>
30	44	</div>
31	45	<div class="labels-create-right">
32		- <div class="btn">
	46	+ <div class="labels-create-cancel-btn btn">
33	47	Cancel
34	48	</div>
35		- <div class="btn btn-success">
	49	+ <div class="labels-create-create-btn btn btn-success">
36	50	Create label
37	51	</div>
38	52	</div>