Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

remotes/origin/1203
Kotiuk Nazarii 11 years ago
commit 19adfff168
  1. 2
      .gitignore
  2. 132
      templates/client/static_client/css/main.css
  3. 2
      templates/client/static_client/css_min/main.min.css
  4. 1214
      templates/client/static_client/html-cut/subscribe.html
  5. BIN
      templates/client/static_client/img/arrow.png
  6. BIN
      templates/client/static_client/img/soc-medias/email/gmail.png
  7. BIN
      templates/client/static_client/img/soc-medias/email/mailru.png
  8. BIN
      templates/client/static_client/img/soc-medias/email/rambler.png
  9. BIN
      templates/client/static_client/img/soc-medias/email/yahoo.png
  10. BIN
      templates/client/static_client/img/soc-medias/email/yandex.png

2
.gitignore vendored

@ -13,3 +13,5 @@ npm-debug.log
node_modules

@ -13433,11 +13433,140 @@ hr + .rq-note {
.сallback-modal .required.err:before{
margin-top: 2px;
}
/************************\
# subscribe modal window
\***********************/
.subscribe-modal{
width: 560px;
color: #000000;
}
.subscribe-modal .pw-form .pwf-field{
width: 340px;
}
.subscribe-modal .required.err:before{
margin-top: 2px;
}
.subscribe-modal .submit{
cursor: pointer;
}
.subscribe-modal .pw-title {
font-size: 26px;
font-weight: 300;
}
.subscribe-modal .sub-header{
margin-top: 0;
}
.subscribe-modal .submit-arrow{
display: inline-block;
margin-left: 20px;
}
.subscribe-modal header{
padding-bottom: 0;
}
.subscribe-modal .gray{
color: #8d807f;
}
.subscribe-modal .small{
font-size: .9em;
}
/************************\
# subscribe lessons modal window
\***********************/
.subscribe-modal.lessons .form-side{
float: left;
width: 60%;
position: relative;
z-index: 1;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding-left: 14px;
}
.subscribe-modal.lessons .image-side{
float: left;
width: 40%;
}
.subscribe-modal.lessons .image-side{
}
.subscribe-modal.lessons .image-side img{
position: absolute;
width: 233px;
margin-left: -42px;
margin-bottom: -19px;
z-index: 0;
}
.subscribe-modal.lessons .label-header{
font-size: 18px;
}
.subscribe-modal.lessons .label-header .small{
font-size: .8em;
}
.subscribe-modal.lessons .pw-form .pwf-field{
width: 214px;
}
.subscribe-modal.lessons .pw-form .submit{
height: 42px;
line-height: 42px;
width: 214px;
}
.subscribe-modal.lessons .submit-arrow {
position: absolute;
right: 0;
margin-right: -20px;
}
/************************\
# add event page /organiser/add-event/
# invite logist modal window
\***********************/
.invite-modal{
width: 560px;
color: #000000;
}
.invite-modal .logos{
display: table;
margin-left: auto;
margin-right: auto;
margin-bottom: 26px;
}
.invite-modal .logos .item{
display: inline-block;
margin-left: 16px;
}
.invite-modal .logos .item:first-child{
margin-left: 0;
}
.invite-modal .label p{
margin: 0;
}
.invite-modal .pw-title{
font-size: 24px;
font-weight: 400;
line-height: 25px;
}
.invite-modal .button{
height: 42px;
line-height: 42px;
padding-top: 0;
padding-bottom: 0;
font-size: 15px;
width: 214px;
text-align: center;
}
.invite-modal .submit-arrow{
display: inline-block;
margin-left: 20px;
}
/************************\
# add event page /organiser/add-event/
\***********************/
.add-event-page .set-sect.not-active .form-wrap{
display: none;
}
@ -13457,7 +13586,6 @@ hr + .rq-note {
color: #d80000;
}
/************************\
# completion of registration modal
# after registration form

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Loading…
Cancel
Save