Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option
This commit is contained in:
		
				commit
				
					
						23b927f7fb
					
				
			
		
					 3 changed files with 15 additions and 11 deletions
				
			
		|  | @ -73,7 +73,7 @@ | |||
| } | ||||
| 
 | ||||
| .modal-header { | ||||
|   min-height: 25px; | ||||
|   min-height: 30px; | ||||
| } | ||||
| 
 | ||||
| .modal-header .close { | ||||
|  | @ -82,8 +82,12 @@ | |||
|     margin-top: 0; | ||||
|     position: absolute; | ||||
|     top: 0; | ||||
|     right: 15px; | ||||
|     right: 11px; | ||||
|     z-index: 10; | ||||
|     line-height: 60px; | ||||
| } | ||||
| .modal-header .close span { | ||||
|   display: block; | ||||
| } | ||||
| 
 | ||||
| .modal-header .close:focus { | ||||
|  | @ -98,8 +102,8 @@ | |||
| .modal-body { | ||||
|     text-align: center; | ||||
|     width: 100%; | ||||
|   float: left; | ||||
|   padding: 0px 30px 15px 30px; | ||||
|     float: left; | ||||
|     padding: 0px 40px 15px 30px; | ||||
| } | ||||
| .modal-body .modal-icon i { | ||||
|     font-size: 80px; | ||||
|  | @ -145,7 +149,7 @@ | |||
| @media (max-width: 767px) { | ||||
|     .modal-dialog { | ||||
| /*     top: 30%; */ | ||||
|     width: 90%; | ||||
|     width: 95%; | ||||
|     margin: 0 auto !important; | ||||
|   } | ||||
| } | ||||
|  |  | |||
|  | @ -71,6 +71,10 @@ | |||
|     } | ||||
| } | ||||
| 
 | ||||
| @media (max-width: 420px) { | ||||
|     .ssh-keys-table {table-layout: fixed;} | ||||
| } | ||||
| 
 | ||||
| .ssh-keys-table thead tr th, | ||||
| .ssh-keys-table tbody tr td{ | ||||
|     color: #717274; | ||||
|  |  | |||
|  | @ -53,10 +53,6 @@ | |||
|                                         <form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}"> | ||||
|                                             {% csrf_token %} | ||||
|                                             <div class="modal-footer"> | ||||
|                                                 <button type="button" class="btn btn-default" | ||||
|                                                         data-dismiss="modal"> | ||||
|                                                     {% trans "Close" %} | ||||
|                                                 </button> | ||||
|                                                 <button type="submit" class="btn btn-primary">{% trans "Delete" %} | ||||
|                                                 </button> | ||||
|                                             </div> | ||||
|  | @ -78,10 +74,10 @@ | |||
|                                                 aria-label="Confirm"><span | ||||
|                                                 aria-hidden="true">×</span> | ||||
|                                         </button> | ||||
|                                         <h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public ssh key" %}</h4> | ||||
|                                     </div> | ||||
|                                     <div class="modal-body"> | ||||
|                                         <p>{{ user_key.public_key }}</p> | ||||
|                                         <h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public ssh key" %}</h4> | ||||
|                                         <p style="margin-top: 10px;">{{ user_key.public_key }}</p> | ||||
|                                         <div class="modal-footer"> | ||||
|                                             <button type="button" class="btn btn-default" | ||||
|                                                     data-dismiss="modal"> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue