From 02c46742023570b939eacc15bd17d74c8eca4bbc Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 29 Dec 2016 15:38:26 +0000 Subject: [PATCH] moved the position of the author id in the code history view --- codepot/src/codepot/views/code_history.php | 14 ++++++----- codepot/src/css/code.css | 29 +++++++++++----------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/codepot/src/codepot/views/code_history.php b/codepot/src/codepot/views/code_history.php index c75530f6..fb6fb939 100644 --- a/codepot/src/codepot/views/code_history.php +++ b/codepot/src/codepot/views/code_history.php @@ -139,12 +139,6 @@ $this->load->view ( print "
"; print ""; print "
"; - - print '
'; - print ""; - print htmlspecialchars($h['author']); - print ''; - print '
'; } print ''; @@ -184,8 +178,16 @@ $this->load->view ( print codepot_unixtimetodispdate(strtotime($h['date'])); print ''; print ''; + + print '
'; + print ""; + print htmlspecialchars($h['author']); + print ''; print '
'; + print ''; + + print '
'; if ($file['type'] == 'file') { diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css index 87a88c46..0c8035b5 100644 --- a/codepot/src/css/code.css +++ b/codepot/src/css/code.css @@ -231,11 +231,6 @@ height: 3em; } -#code_history_result_table .commit-author-id { - font-weight: bold; - font-size: 0.9em; -} - #code_history_result_table td.commit-message-td { vertical-align: middle; } @@ -278,14 +273,9 @@ vertical-align: middle; } -#code_history_result_table .commit-actions { - display: flex; - flex-wrap: wrap; - justify-content: flex-end; - vertical-align: middle; -} -#code_history_result_table .commit-revision { +#code_history_result_table .commit-revision, +#code_history_result_table .commit-author-id { background-color: #008CBA; border: 1px solid #008CBA; color: white; @@ -299,13 +289,24 @@ transition-duration: 0.4s; } -#code_history_result_table .commit-revision:hover { +#code_history_result_table .commit-revision:hover, +#code_history_result_table .commit-author-id:hover { background-color: #00BCFA; } +#code_history_result_table .commit-actions { + display: flex; + flex-wrap: wrap; + justify-content: flex-end; + vertical-align: middle; +} + #code_history_result_table .commit-revision a, #code_history_result_table .commit-revision a:hover, -#code_history_result_table .commit-revision a:visited { +#code_history_result_table .commit-revision a:visited, +#code_history_result_table .commit-author-id a, +#code_history_result_table .commit-author-id a:hover, +#code_history_result_table .commit-author-id a:visited { color: white }