Skip to content

Commit

Permalink
User Interface
Browse files Browse the repository at this point in the history
  • Loading branch information
alfonsofiz authored and alfonsofiz committed Jul 26, 2016
1 parent 9dfb519 commit f499cf5
Show file tree
Hide file tree
Showing 20 changed files with 260 additions and 84 deletions.
10 changes: 5 additions & 5 deletions client/clase/joinSchoolClassRoom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h4>Añadir Hijo</h4>
</header>
<div class="content">
<div class="wrapper">
<h4>{{_ "Create_new" }}</h4>
<!-- <h4>{{_ "Create_new" }}</h4> -->
<div class="input-line">
<label for="clase-child-name">Nombre hij@</label>
<input type="text" id="clase-child-name" class="required" dir="auto" placeholder="{{_ 'Enter_name_here'}}">
Expand All @@ -26,8 +26,8 @@ <h4>{{_ "Create_new" }}</h4>
<option value="2">2 primaria</option>
<option value="3">3 primaria</option>
<option value="4">4 primaria</option>
<option value="4">5 primaria</option>
<option value="4">6 primaria</option>
<option value="5">5 primaria</option>
<option value="6">6 primaria</option>
</select>
</div>
<div class="input-line">
Expand All @@ -37,8 +37,8 @@ <h4>{{_ "Create_new" }}</h4>
<option value="B">B</option>
<option value="C">C</option>
<option value="D">D</option>
<option value="D">E</option>
<option value="D">F</option>
<option value="E">E</option>
<option value="F">F</option>
</select>
</div>
{{#if error.fields}}
Expand Down
11 changes: 10 additions & 1 deletion client/clase/style.less
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
.pinned {
background-color: red;
//background-color: red;
border-left: 10px solid #229bd6;
text-align: left;
margin-left: 20px;
}
.clase-title {
color: #ffed00;
}
.clase-list {
color: #ffffff;
}
4 changes: 2 additions & 2 deletions packages/rocketchat-lib/i18n/es.i18n.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"Changing_email" : "El cambio de correo electrónico",
"Channel" : "Canal",
"Channel_doesnt_exist" : "El canal `#%s` no existe",
"Channels" : "Canales",
"Channels" : "clases",
"Channels_list" : "Lista de canales públicos",
"Chat_button" : "botón de chat",
"Chat_closed" : "chatear cerrada",
Expand Down Expand Up @@ -1197,4 +1197,4 @@
"Your_mail_was_sent_to_s" : "Su correo electrónico fue enviado a %s",
"Your_password_is_wrong" : "Su contraseña es incorrecta!",
"Your_push_was_sent_to_s_devices" : "Su push fue enviado a los dispositivos %s"
}
}
2 changes: 1 addition & 1 deletion packages/rocketchat-livechat/app/client/views/livechatWindow.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{#if livechatStarted}}
<div class="livechat-room">
<div class="title" style="background-color:{{color}}">
<div class="toolbar">
<div class="toolbar">
&nbsp;
{{#if soundActive}}
<i class="sound icon-bell-alt" title="Toggle notification sound"></i>
Expand Down
75 changes: 62 additions & 13 deletions packages/rocketchat-theme/assets/stylesheets/base.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,10 @@ label.required:after {
&:extend(.unselectable);
display: inline-block;
padding: 9px 12px;
font-weight: 500;
font-weight: 700;
font-size: 13px;
text-align: center;
margin: 4px;
margin: 20px;
text-transform: uppercase;
word-spacing: 0;
box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.125);
Expand Down Expand Up @@ -1234,7 +1234,7 @@ a.github-fork {
margin-bottom: 0;
}
label {
text-transform: uppercase;
//text-transform: uppercase;
font-weight: 400;
margin-bottom: 0;
}
Expand Down Expand Up @@ -1721,7 +1721,7 @@ a.github-fork {
top: 0;
bottom: 0;
left: @rooms-box-width;
right: 40px;
right: 0px;
width: auto;
height: auto;
&.flex-opened {
Expand Down Expand Up @@ -2419,6 +2419,15 @@ a.github-fork {
.start {
text-align: center;
margin-top: 12px;
margin-bottom: 50px;
h3{
margin: 30px auto;
font-size: 20px;
font-weight: 200;
}
p{
margin-bottom: 7px;
}
}
.new-message {
.unselectable;
Expand Down Expand Up @@ -2498,10 +2507,19 @@ a.github-fork {
}

.message {
padding: 8px 20px 4px 70px;
padding: 8px 8px 8px 15px;
position: relative;
line-height: 20px;
min-height: 40px;
margin: 8px 50px 8px 20px;
border-radius: 7px;
box-shadow: 0px 1px 2px rgba(0,0,0,.15);

&.own {
background-color: #DCF8C6;
text-align: right;
}

&.highlight {
-webkit-animation: highlight 3s;
-moz-animation: highlight 3s;
Expand All @@ -2514,6 +2532,10 @@ a.github-fork {
&:hover {
background-color: @message-hover-background-color;
}
.time {
display: block;
font-size: 11px;
}
&.new-day {
margin-top: 60px;
&:before {
Expand Down Expand Up @@ -2548,8 +2570,11 @@ a.github-fork {
display: block;
}
.message-cog-container {
position: relative;
display: inline-block;
//position: relative;
//display: inline-block;
position: absolute;;
display: block;
margin-left: -10px;
.message-cog {
visibility: hidden;
cursor: pointer;
Expand Down Expand Up @@ -3720,11 +3745,11 @@ body:not(.is-cordova) {

#login-card {
width: 100%;
max-width: 520px;
max-width: 350px;
padding: 20px;
margin: 20px auto;
box-shadow: 0 0 6px 10px rgba(0, 0, 0, 0.1);
border-radius: 2px;
//box-shadow: 0 0 6px 10px rgba(0, 0, 0, 0.1);
//border-radius: 2px;
position: relative;
z-index: 1;
header {
Expand Down Expand Up @@ -3796,9 +3821,9 @@ body:not(.is-cordova) {
border-width: 0;
position: relative;
padding: 4px 8px;
font-size: 18px;
font-size: 14px;
border-bottom: 1px solid;
font-weight: 400;
font-weight: 200;
border-radius: 0px;
&.error {
border-bottom: 1px solid;
Expand Down Expand Up @@ -3851,14 +3876,31 @@ body:not(.is-cordova) {
width: 100%;
min-height: 100%;
z-index: 101;

.clase-logo {
font-size: 45px;
color:#ffed00;
margin-bottom: 25px;
margin-top: 1px;
font-weight: 300;
}

.clase-desc {
font-size: 16px;
color:#ffffff;
margin-bottom: 80px;
font-weight: 200;
}
.wrapper {
background-color: #229bd6;
text-align: center;
z-index: 10;
position: relative;
width: 100%;
padding: 20px;
}
.logo {
background-color: #229bd6;
display: block;
> img {
display: inline-block;
Expand All @@ -3871,6 +3913,11 @@ body:not(.is-cordova) {
max-width: 100%;
}
}
.register {
margin-bottom: 10px;
margin-top: 30px;
font-size: 16px;
}
a {
font-weight: 300;
}
Expand Down Expand Up @@ -3918,6 +3965,7 @@ body:not(.is-cordova) {
}
}
footer {
background-color: #229bd6;
padding: 20px 0 0;
position: relative;
z-index: 1;
Expand Down Expand Up @@ -4534,7 +4582,8 @@ body:not(.is-cordova) {
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, .5);
//background-color: rgba(0, 0, 0, .5);
background-color: #229bd6;
z-index: 1000;
display: flex;
align-items: center;
Expand Down
Loading

0 comments on commit f499cf5

Please sign in to comment.