Repository: incubator-atlas Updated Branches: refs/heads/master f51c88615 -> d381f3d58
ATLAS-970 Remove glyphicon from login.jsp (kevalbhatt18 via shwethags) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/d381f3d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/d381f3d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/d381f3d5 Branch: refs/heads/master Commit: d381f3d58aae758162e1aa9d49566d4a5f2a59c0 Parents: f51c886 Author: Shwetha GS <[email protected]> Authored: Tue Jul 5 11:17:16 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Tue Jul 5 11:17:16 2016 +0530 ---------------------------------------------------------------------- dashboardv2/public/css/scss/form.scss | 4 ---- dashboardv2/public/css/scss/loader.scss | 4 ---- release-log.txt | 1 + webapp/src/main/webapp/login.jsp | 5 +++-- 4 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/d381f3d5/dashboardv2/public/css/scss/form.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/form.scss b/dashboardv2/public/css/scss/form.scss index 6802c12..0cae6f6 100644 --- a/dashboardv2/public/css/scss/form.scss +++ b/dashboardv2/public/css/scss/form.scss @@ -177,10 +177,6 @@ button:focus { padding-bottom: 10px!important; } -.input-group-btn .glyphicon { - top: 2px; -} - .pagination > .active { > a { background-color: $color_curious_blue_approx; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/d381f3d5/dashboardv2/public/css/scss/loader.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/loader.scss b/dashboardv2/public/css/scss/loader.scss index 080283a..d668c38 100644 --- a/dashboardv2/public/css/scss/loader.scss +++ b/dashboardv2/public/css/scss/loader.scss @@ -23,10 +23,6 @@ animation: spin 1000ms infinite linear; } -.glyphicon-spin { - animation: spin 1000ms infinite linear; -} - @-webkit-keyframes spin { 0% { //Instead of the line below you could use @include transform($scale, $rotate, $transx, $transy, $skewx, $skewy, $originx, $originy) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/d381f3d5/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5de6df1..1e5f4e5 100644 --- a/release-log.txt +++ b/release-log.txt @@ -37,6 +37,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-970 Remove glyphicon from login.jsp (kevalbhatt18 via shwethags) ATLAS-959 Exception while writing to audit log. [java.io.IOException: No FileSystem for scheme: hdfs] (saqeeb.s via sumasai) ATLAS-967 Remove unused logo file and footer. (kevalbhatt18 via yhemanth) ATLAS-964 Cleanup NOTICE and LICENSE (shwethags) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/d381f3d5/webapp/src/main/webapp/login.jsp ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/login.jsp b/webapp/src/main/webapp/login.jsp index cf5990a..54a623a 100644 --- a/webapp/src/main/webapp/login.jsp +++ b/webapp/src/main/webapp/login.jsp @@ -28,6 +28,7 @@ <meta name="description" content=""> <meta name="viewport" content="width=device-width"> <link href="js/libs/bootstrap/css/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css"> + <link href="js/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet"> <link href="css/login.css" media="all" rel="stylesheet" type="text/css" > <script src="js/libs/jquery/js/jquery.min.js" ></script> <script src="js/modules/atlasLogin.js" ></script> @@ -42,11 +43,11 @@ <div class="login-pane"> <h2 align="center">Apache <strong>Atlas</strong></h2> <div class="input-group"> - <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span> + <span class="input-group-addon"><i class="fa fa-user"></i></span> <input type="text" class="form-control" id="username" name="username" placeholder="Username" tabindex="1" required="" autofocus> </div> <div class="input-group"> - <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span> + <span class="input-group-addon"><i class="fa fa-lock"></i></span> <input type="password" class="form-control" name="password" placeholder="Password" id="password" tabindex="2" autocomplete="off" required> </div> <span id="errorBox" class="col-md-12 help-inline" style="color:#FF1A40;display:none;text-align:center;padding-bottom: 10px;"><span class="errorMsg"></span></span>
