diff options
| author | garbash <dor.garbash@gmail.com> | 2015-01-12 12:34:40 +0200 |
|---|---|---|
| committer | garbash <dor.garbash@gmail.com> | 2015-01-12 12:34:40 +0200 |
| commit | 944618160f5c974bbe463f1a7e0572ea76a476e4 (patch) | |
| tree | dcb41426725f2e42bc7497d6a329480431205278 /res | |
| parent | 365e20af3810f67b0a22f651fd0807b40cbacc04 (diff) | |
| parent | 2974f916df0614c892a94d3e0f192e10aa03b0b6 (diff) | |
moved mail-icon img to css
Diffstat (limited to 'res')
| -rw-r--r-- | res/client/css/partials/login.scss | 6 | ||||
| -rw-r--r-- | res/templates/index.html | 10 | ||||
| -rw-r--r-- | res/templates/login.html | 5 |
3 files changed, 10 insertions, 11 deletions
diff --git a/res/client/css/partials/login.scss b/res/client/css/partials/login.scss index 79c315bb..3c147735 100644 --- a/res/client/css/partials/login.scss +++ b/res/client/css/partials/login.scss @@ -99,7 +99,7 @@ } } &[type="email"] { - background: url(../img/mail-icon.png) no-repeat scroll 20px 15px; + background: url(../static/img/mail-icon.png) no-repeat scroll 20px 15px; background-color:$light-grey; border: 1px solid #dcdcdc; padding: 12px 10px; @@ -109,7 +109,7 @@ } &[type="password"] { - background: url(../img/password-icon.png) no-repeat scroll 20px 15px; + background: url(../static/img/password-icon.png) no-repeat scroll 20px 15px; background-color:$light-grey; border: 1px solid #dcdcdc; padding: 12px 10px; @@ -154,7 +154,7 @@ text-align: center; -moz-box-sizing: border-box; box-sizing: border-box; - background: url(../img/hr-email-icon.png) no-repeat; + background: url(../static/img/hr-email-icon.png) no-repeat; margin-left: auto; display: inline-block; margin-right: auto; diff --git a/res/templates/index.html b/res/templates/index.html index cba394d6..13913ba2 100644 --- a/res/templates/index.html +++ b/res/templates/index.html @@ -2,11 +2,11 @@ <head> <title>Rhizi Prototype </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <link href="/res/css/style.css" rel="stylesheet" type="text/css"> - <link rel="shortcut icon" href="/res/img/favicon2.ico" /> + <link href="/static/css/style.css" rel="stylesheet" type="text/css"> + <link rel="shortcut icon" href="/static/img/favicon2.ico" /> <script src="/static/local_config.js"></script> - <script data-main='/static/app.js' src="/res/lib/require.js"></script> + <script data-main='/static/app.js' src="/static/lib/require.js"></script> </head> @@ -25,7 +25,7 @@ <span class="profile-initials">AN<!-- must be two letters because of css --></span> <div class="profile-username">Welcome <span id="user_id">Anonymous</span>! <span id="logout-button" class="button">Logout</span></div> </div> - <img class="organization-logo" src="/res/img/CRI-logo.png"> + <img class="organization-logo" src="/static/img/CRI-logo.png"> </div> </div> <div class="search-bar"> @@ -123,7 +123,7 @@ </div> <div class="rhizi-logo"><a href="http://www.rhizi.org"> - <img src="/res/img/rhizi-logo.png"/></a> + <img src="/static/img/rhizi-logo.png"/></a> </div> </div> diff --git a/res/templates/login.html b/res/templates/login.html index ac752e99..f35bccdc 100644 --- a/res/templates/login.html +++ b/res/templates/login.html @@ -2,7 +2,7 @@ <head> <meta charset="UTF-8"> <title>Welcome to Rhizi</title> -<link href="/res/css/style.css" rel="stylesheet" type="text/css"> +<link href="/static/css/style.css" rel="stylesheet" type="text/css"> <script src="/static/lib/jquery.js" type="text/javascript"></script> <script type="text/javascript"> function submit_login_form() { @@ -28,7 +28,7 @@ <body class="login-background"> <div class="welcome-box"> - <img src="/res/img/logo-red.png" class="login-rhizi-logo"> + <img src="/static/img/logo-red.png" class="login-rhizi-logo"> <div class="login-text"> <h1 class="login-header"> Welcome to Rhizi!</h1> <p><b>Rhizi is a collaborative knowledge editor.</b></p> @@ -53,7 +53,6 @@ <div class="contact-us-div"><span class="contact-us-icon"></span></div> <p class="login-text contact-us-text"><a class="contact-us-link" href="mailto:dor.garbash@gmail.com">Send us an Email</a> about your experience, especially if you encountered any problem!</p> - </div> </body> </html> |