Skip to content

Commit 4b2d11f

Browse files
amitojsinghamitojsingh
committed
Improved UI
1 parent d75e304 commit 4b2d11f

File tree

9 files changed

+139
-30
lines changed

9 files changed

+139
-30
lines changed

‎app/assets/images/code.png‎

-58 KB
Binary file not shown.

‎app/assets/stylesheets/base/_atom.scss‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,10 @@ a.link {
182182
font-style:$root-font;
183183
}
184184
#repository_upload{
185-
width:20em;
186-
height:2em;
187-
background-color:$silver;
185+
width:50%;
186+
background-color:$trav;
187+
color:$silver;
188+
font-size: 1em;
188189
}
189190
.fac,.vac{
190191
font-family:$ornate-font;
@@ -194,3 +195,18 @@ a.link {
194195
.vac{
195196
color:#3498db;
196197
}
198+
199+
#user_email,#user_password,.submit-button{
200+
width:95%;
201+
font-size:18px;
202+
height:2em;
203+
border:none;
204+
text-indent:1em;
205+
}
206+
.upload-submit{
207+
background-color:$green;
208+
color:#fff;
209+
border:none;
210+
width:20%;
211+
font-size:1.2em;
212+
}

‎app/assets/stylesheets/base/_molecule.scss‎

Lines changed: 53 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,25 @@ header{
127127
color:#fff;
128128
}
129129
}
130-
.upload-container{
131-
height:80%;
132-
margin-left:5em;
133130
.container-wrapper{
134131
width:60%;
132+
padding:2%;
133+
h1{
134+
margin:0;
135+
}
136+
.upload-wrapper{
137+
margin-top:2%;
138+
margin-bottom:2%;
139+
}
135140
}
136-
}
137141
.body-wrapper{
138142
position: fixed;
139143
width:100%;
140144
height:100%;
141145
background:url('code.png') no-repeat center center;
142146
background-size:65%;
143147
.body-color{
144-
background-color: rgba(63,71,72,0.9);
148+
background-color: $box;
145149
width:100%;
146150
height:100%;
147151
}
@@ -154,12 +158,7 @@ header{
154158

155159
}
156160
.login-wrapper{
157-
#user_email,#user_password,.submit-button{
158-
width:15em;
159-
font-size:18px;
160-
height:2em;
161-
border:none;
162-
}
161+
163162
.login-text{
164163
font-family:$root-font;
165164
font-size:30px;
@@ -189,7 +188,7 @@ header{
189188

190189
}
191190
h1{
192-
margin-left:0.5em;
191+
margin-left:1.5em;
193192
font-family: $main-font;
194193
font-size:55px;
195194
color:$landing;
@@ -201,3 +200,45 @@ header{
201200
height:100%;
202201
background-color:$back-pannel;
203202
}
203+
.signup-wrapper{
204+
width:100%;
205+
height:100%;
206+
background:url('stardust.png') no-repeat center center fixed;
207+
background-size:cover;
208+
display:flex;
209+
justify-content: center;
210+
flex-direction: column;
211+
.signup-box{
212+
width:40%;
213+
height:60%;
214+
margin-left:auto;
215+
margin-right:auto;
216+
background-color:rgba(255,255,255,0.7);
217+
.signup-subox{
218+
margin:10%;
219+
h2{
220+
margin:0;
221+
}
222+
.user-email,.user-password{
223+
width:95%;
224+
height:0.5em;
225+
text-indent:1em;
226+
}
227+
.signup-button{
228+
width:95%;
229+
height:2em;
230+
background-color:$green;
231+
color:#fff;
232+
font-size:1em;
233+
border:none
234+
}
235+
}
236+
}}
237+
238+
.user-pass-confirm{
239+
width:95%;
240+
height:2.5em;
241+
text-indent:10px;
242+
margin-top:1em;
243+
margin-bottom: 2em;
244+
}

‎app/assets/stylesheets/base/_page.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ ul#tabs {
3232
background:url('stardust.png') no-repeat center center fixed;
3333
background-size: cover;
3434
}
35+
36+
.github-button{
37+
38+
}

‎app/assets/stylesheets/base/_template.scss‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,40 @@ header {
8383
}
8484
}
8585
}
86+
.upload-box{
87+
width:100%;
88+
height:90%;
89+
background-color:$back-pannel;
90+
}
91+
.git-wrapper{
92+
width:100%;
93+
height:90%;
94+
background-color:$back-pannel;
95+
h1{
96+
margin:0;
97+
}
98+
.git-box{
99+
width:50%;
100+
height:50%;
101+
color:$silver;
102+
font-family:$root-font;
103+
padding:2%;
104+
.new_gitrepo{
105+
margin-top:1em;
106+
width:100%;
107+
height:100%;
108+
.url-field,{
109+
width:40%;
110+
height:10%;
111+
text-indent: 10px;
112+
}
113+
.url-submit{
114+
width:30%;
115+
height:12%;
116+
background-color:$green;
117+
color:#fff;
118+
border:none;
119+
}
120+
}
121+
}
122+
}

‎app/assets/stylesheets/base/_variable.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ $dialoge-border:#2980b9;
2828
$upload:#27ae60;
2929
$landing:#1abc9c;
3030
$green: #2ecc71;
31+
$box:rgba(63,71,72,0.9);

‎app/views/devise/registrations/new.html.erb‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,36 @@
1-
<h2>Sign up</h2>
1+
<div class=signup-wrapper>
2+
<div class=signup-box>
3+
<div class=signup-subox>
4+
<h2>Sign up</h2>
25

36
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
47
<%= devise_error_messages! %>
58

69
<div class="field">
710
<%= f.label :email %><br />
8-
<%= f.email_field :email, autofocus: true %>
11+
<%= f.email_field :email, autofocus: true, class: "user-email", placeholder: "Email" %>
912
</div>
1013

1114
<div class="field">
1215
<%= f.label :password %>
1316
<% if @minimum_password_length %>
1417
<em>(<%= @minimum_password_length %> characters minimum)</em>
15-
<% end %><br />
16-
<%= f.password_field :password, autocomplete: "off" %>
18+
<% end %>
19+
<%= f.password_field :password, autocomplete: "off", class:"user-password", placeholder: "password"%>
1720
</div>
1821

1922
<div class="field">
20-
<%= f.label :password_confirmation %><br />
21-
<%= f.password_field :password_confirmation, autocomplete: "off" %>
23+
<%= f.label :password_confirmation %>
24+
<%= f.password_field :password_confirmation, autocomplete: "off", class:"user-pass-confirm", placeholder: "Confirm Password"%>
2225
</div>
2326

2427
<div class="actions">
25-
<%= f.submit "Sign up" %>
28+
<%= f.submit "Sign up", class: "signup-button"%>
2629
</div>
2730
<% end %>
2831

2932
<%= render "devise/shared/links" %>
33+
</div>
34+
35+
</div>
36+
</div>

‎app/views/gitrepos/newrepo.html.erb‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
<h1>Gitrepos#newrepo</h1>
2-
<p>Find me in app/views/gitrepos/newrepo.html.erb</p>
3-
<%=form_for @gitrepo do |form|%>
1+
<div class=git-wrapper>
2+
<div class=git-box>
3+
<h1>Upload via Github</h1>
4+
<%=form_for @gitrepo, class: "url-form" do |form|%>
45
<%=form.label "Paste your github link here"%>
5-
<%=form.text_field :url%>
6-
<%=form.submit%>
6+
<%=form.text_field :url, class:"url-field", placeholder: "Place your Github link here"%>
7+
<%=form.submit class:"url-submit"%>
78
<%end%>
9+
</div>
10+
</div>

‎app/views/repositories/new.html.erb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<div class="upload-container">
1+
<div class="upload-box">
22
<div class="container-wrapper">
33
<h1 class="heading-upload">Upload Repository</h1>
44
<div class="upload-wrapper">
55
<%= form_for @repository, html: { multipart: true } do |form| %>
66
<%= form.file_field :upload, name: "upload" %>
7-
<%= form.submit %>
7+
<%= form.submit class:"upload-submit"%>
88
<%end%>
99
</div>
10-
<%= button_to "Github",gitrepos_newrepo_path,class:"github-button"%>
10+
<%= button_to "github",gitrepos_newrepo_path,class:"github-button"%>
1111
</div>
1212
</div>

0 commit comments

Comments
 (0)