Compare text

Find the difference between two text files

Real-time editor

Hide unchanged lines

Disable line wrap

Layout

Diff precision

Syntax highlighting

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 10 years agoDiff never expires

27 removals

Lines
Total
Removed

Characters
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

300 lines

132 additions

Lines
Total
Added

Characters
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

397 lines

@charset "utf-8";

/* 高亮颜色 #00c680 */

* {

margin: 0;

padding: 0;

border: 0;

}

html, body {

height: 100%;

-moz-user-select: none;

-o-user-select:none;

-khtml-user-select:none;

-webkit-user-select:none;

-ms-user-select:none;

user-select:none;/**禁止选中文字*/

user-select:none;

}

input:focus, a:focus {

outline: none;

}

body {

font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;

font-weight: 200;

background-color: #FBFBFB;

min-width: 1100px;

}

a {

text-decoration: none;

}

a[href] {

color: #B0B0B0;

}

a[href]:active {

color: #828689;

boder: none;

}

.fl{

float:left;

}

.fr{

float:right;

}

.img-responsive {

width: 100%;

height: auto;

display: block;

border: none;

}

.logo {

width: 161px;

font-size: 32px;

color: #FFF;

background: url(../images/logo.png) no-repeat;

width: 60px;

height: 32px;

float: left;

margin: 7px 10px 11px 18px;

}

.logo-font {

.logo i {

padding: 13px 0;

font-size: 32px;

color: #FFF;

transition: all 1s linear;

}

.logo-font p, .logo-font span {

.logo:hover i {

font-size: 13px;

color: #00c680;

color: #fff;

transition: all 0.5s linear;

line-height: 0.6;

}

.header {

width: 100%;

}

/* 导航栏 */

/* header-nav */

.header-nav {

width: 100%;

height: 50px;

position: fixed;

top: 0px;

left: 0px;

z-index: 999;

background-color: #1E1D23;

background-color: rgb(45, 45, 45);;

-webkit-box-sizing: border-box;

}

.logo-btn {

width: 161px;

height: 32px;

display: block;

display: inline;

}

/* 左侧功能 */

.nav-left {

float: left;

margin-left: 33px;

margin-top: 12px;

display: none;

}

.nav-left a, .nav-right a {

color: #FFF !important;

font-size: 14px;

display: block;

float:left;

padding: 6.5px 15px;

}

/* 右侧登陆注册 */

.nav-right {

float: right;

margin-top: 19px;

margin-right: 20px;

display: none;

}

.nav-right a {

float: left;

padding: 0px 10px;

}

.login {

padding-right: 9px !important;

border-right: 1px solid #fff;

}

.nav-right input {

float:left;

border: none;

height: 16.5px;

width: 30px;

margin-right: 35px;

display: none;

}

/* 返回按钮 */

.raturn {

width: 730px;

height: 20px;

margin: 0px auto;

}

.raturn i {

height: 20px;

font-size: 20px;

display: inline-block;

color: #BDBDBD;

float: left;

}

.raturn a {

width: 54px;

height: 20px;

display: block;

float: left;

}

.raturn span {

font-size: 12px !important;

margin-left: 5px;

display: inline-block;

height: 20px;

line-height: 23px;

float: left;

}

.raturn a:hover span {

color: #44545E;

}

.raturn a:hover i {

color: #44545E;

}

.friend-link {

width: 48%;

margin-top: 160px !important;

margin-left: auto;

margin-right: auto;

font-size:12px;

color:#333333;

letter-spacing:0px;

}

.friend-link p{

font-family:PingFangSC-Regular;

font-size:12px;

color:#a2a1a1;

letter-spacing:0px;

height:20px;

line-height:20px;

}

.friend-link .flink-title{

color:#333333;

}

/* footer */

.footer {

width: 100%;

min-width: 1100px;

height: 55px;

margin-top: 30px;

margin-top: 50px;

text-align: center;

color: #B0B0B0;

font-size: 12px;

line-height: 55px;

font-weight: 300;

float: left;

cursor: default;

z-index: 12;

}

.footer-border {

width: 70%;

height: 1px;

margin: 0 auto;

background-image: linear-gradient(-90deg, rgba(255,255,255,0.00) 0%, #D0D0D0 52%, rgba(255,255,255,0.00) 100%);

}

.footer a {

padding-left: 10px;

transition: all 0.5s;

}

.footer a:hover {

color: #00c680;

transition: all 0.5s;

}

@media only screen and (min-width:100px) and (max-width:1100px) {

.friend-link{

width:62%;

}

.header-img {

display: none

}

.header-nav {

z-index: 99;

z-index: 1;

}

body {

min-width: 320px;

}

.mobile-menu,

.mobile-menu2 {

display: block;

cursor: pointer

}

.header-bottom {

display: none;

}

.main-bg {

top: 50px;

top: 60px;

min-width: 320px;

width: 100%;

}

.main{

width: 100%;

width: 90%;

padding: 0;

}

.footer {

min-width: 320px;

}

.logo {

margin: 7px auto 11px;

float: none;

}

.logo-font {

display: none;

}

.sidebar {

display: none;

}

.right-side {

margin-left: 0;

}

.main-right {

float:none;

width: 100%;

padding: 0 10px;

box-sizing: border-box;

}

.tag-web {

overflow: hidden;

/*overflow: hidden;*/

}

.tag-web li {

width: 100%;

margin: 10px 0;

/*margin: 10px 0;*/

margin-bottom: 30px;

box-sizing: border-box;

}

.logo-btn {

width: 161px;

height: 32px;

display: block;

margin: auto;

}

.tag-web li a[href]{

width: 100%;

height:147px;

padding: 25px;

box-sizing: border-box;

}

.web-name {

width: calc(100% - 65px);

}

.designer .web-name {

height: 50px;

line-height: 50px;

}

.header-left {

float: none;

position: relative;

left: 50%;

margin-left: -108px

}

.ui {

margin: 20px auto;

float: none;

width: 90%;

text-align: center;

}

.friend-link {

display: none;

}

.footer {

float: none;

margin: 80px auto 0px;

width: 80%;

line-height: 1.8rem;

padding: 20px 0;

}

.footer a {

display: none;

}

/*@media only screen and (min-width:1280px) and (max-width: 1365px) {

}

@media only screen and (min-width:1101px) and (max-width: 1279px) {

}*/

@media only screen and (min-width:1100px) and (max-width: 1365px) {

.tag-web li {

width: 164px;

}

.tag-web li a[href] {

width: 134px;

}

.tag-web{

min-width: 920px;

}

.cate-title{

width:920px;

}

@media only screen and (min-width:1100px) {

.tag-web{

min-width: 1100px

}

.cate-title{

width: 1078px

}

.main-sidebar{

display: block;

}

Saved diffs

Original text

Open file

@charset "utf-8";
/* 高亮颜色 #00c680 */
* {
	margin: 0;
	padding: 0;
	border: 0;
}

html, body {
	height: 100%;
    -moz-user-select: none;
    -o-user-select:none;
    -khtml-user-select:none;
    -webkit-user-select:none;
    -ms-user-select:none;
    user-select:none;/**禁止选中文字*/ 
}

input:focus, a:focus {
	outline: none;
}

body {
	font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
	font-weight: 200;
	background-color: #FBFBFB;
	min-width: 1100px;
}

a {
	text-decoration: none;
}

a[href] {
	color: #B0B0B0;
}

a[href]:active {
	color: #828689;
	boder: none;
}

.img-responsive {
	width: 100%;
	height: auto;
	display: block;
	border: none;
}

.logo {
	width: 161px;
	height: 32px;
	float: left;
	margin: 7px 10px 11px 18px;
}

.logo i {
	font-size: 32px;
	color: #FFF;
	transition: all 1s linear;
}

.logo:hover i {
	color: #00c680;
	transition: all 0.5s linear;
}

.header {
	width: 100%;
}

/* 导航栏 */
/* header-nav */
.header-nav {
	width: 100%;
	height: 50px;
	position: fixed;
	top: 0px;
	left: 0px;
	z-index: 999;
	background-color: #1E1D23;
	-webkit-box-sizing: border-box;
}

.logo-btn {
	width: 161px;
	height: 32px;
	display: block;

}

/* 左侧功能 */
.nav-left {
	float: left;
	margin-left: 33px;
	margin-top: 12px;
	display: none;
}

.nav-left a, .nav-right a {
	color: #FFF !important;
	font-size: 14px;
	display: block;
	float:left;
	padding: 6.5px 15px;
}

/* 右侧登陆注册 */
.nav-right {
	float: right;
	margin-top: 19px;
	margin-right: 20px;
	display: none;
}

.nav-right a {
	float: left;
	padding: 0px 10px;
}

.login {
	padding-right: 9px !important;
	border-right: 1px solid #fff;
}

.nav-right input {
	float:left;
	border: none;
	height: 16.5px;
	width: 30px;
	margin-right: 35px;
	display: none;
}

/* 返回按钮 */
.raturn {
	width: 730px;
	height: 20px;
	margin: 0px auto;
}

.raturn i {
	height: 20px;
	font-size: 20px;
	display: inline-block;
	color: #BDBDBD;
	float: left;
}

.raturn a {
	width: 54px;
	height: 20px;
	display: block;
	float: left;
}

.raturn span {
	font-size: 12px !important;
	margin-left: 5px;
	display: inline-block;
	height: 20px;
	line-height: 23px;
	float: left;
}

.raturn a:hover span {
	color: #44545E;
}
.raturn a:hover i {
	color: #44545E;
}

/* footer */
.footer {
	width: 100%;
	min-width: 1100px;
	height: 55px;
	margin-top: 30px;
	text-align: center;
	color: #B0B0B0;
	font-size: 12px;
	line-height: 55px;
	font-weight: 300;
	float: left;
	cursor: default;
	z-index: 12;
}

.footer-border {
	width: 70%;
	height: 1px;
	margin: 0 auto;
	background-image: linear-gradient(-90deg, rgba(255,255,255,0.00) 0%, #D0D0D0 52%, rgba(255,255,255,0.00) 100%);
}

.footer a {
	padding-left: 10px;
	transition: all 0.5s;
}

.footer a:hover {
	color: #00c680;
	transition: all 0.5s;
}

@media only screen and (min-width:100px) and (max-width:1100px) {
	.header-img {
		display: none
	}

.header-nav {
		z-index: 99;
	}

body {
		min-width: 320px;
	}
	.mobile-menu,
	.mobile-menu2 {
		display: block;
		cursor: pointer
	}
	.header-bottom {
		display: none;
	}

.main-bg {
		top: 50px;
		min-width: 320px;
		width: 100%;
	}

.main{
		width: 100%;
		padding: 0;
	}

.footer {
		min-width: 320px;
	}

.logo {
		margin: 7px auto 11px;
		float: none;
	}

.sidebar {
		display: none;
	}

.main-right {
		float:none;
		width: 100%;
		padding: 0 10px;
		box-sizing: border-box;
	}

.tag-web {
		overflow: hidden;
	}

.tag-web li {
		width: 100%;
		margin: 10px 0;
		box-sizing: border-box;
	}

.logo-btn {
	width: 161px;
	height: 32px;
	display: block;
	margin: auto;
}

.tag-web li a[href]{
		width: 100%;
		height:147px;
		padding: 25px;
		box-sizing: border-box;
	}

.web-name {
		width: calc(100% - 65px);
	}

.header-left {
		float: none;
		position: relative;
		left: 50%;
		margin-left: -108px
	}

.footer a {
		display: none;
	}
}

Changed text

Open file

@charset "utf-8";
* {
	margin: 0;
	padding: 0;
	border: 0;
}

html, body {
	height: 100%;
    -moz-user-select: none;
    -o-user-select:none;
    -khtml-user-select:none;
    -webkit-user-select:none;
    -ms-user-select:none;
    user-select:none;
}

input:focus, a:focus {
	outline: none;
}

a {
	text-decoration: none;
}

a[href] {
	color: #B0B0B0;
}

a[href]:active {
	color: #828689;
	boder: none;
}

.fl{
	float:left;
}
.fr{
	float:right;
}

.img-responsive {
	width: 100%;
	height: auto;
	display: block;
	border: none;
}

.logo {
	font-size: 32px;
	color: #FFF;
	background: url(../images/logo.png) no-repeat;
	width: 60px;
	height: 32px;
	float: left;
	margin: 7px 10px 11px 18px;
}
.logo-font {
	padding: 13px 0;
}
.logo-font p, .logo-font span {
    font-size: 13px;
    color: #fff;
    line-height: 0.6;
}

.header {
	width: 100%;
}

.header-nav {
	width: 100%;
	height: 50px;
	position: fixed;
	top: 0px;
	left: 0px;
	z-index: 999;
	background-color: rgb(45, 45, 45);;
	-webkit-box-sizing: border-box;
}

.logo-btn {
	width: 161px;
	height: 32px;
	display: inline;

}

.nav-left {
	float: left;
	margin-left: 33px;
	margin-top: 12px;
	display: none;
}

.nav-left a, .nav-right a {
	color: #FFF !important;
	font-size: 14px;
	display: block;
	float:left;
	padding: 6.5px 15px;
}

.nav-right {
	float: right;
	margin-top: 19px;
	margin-right: 20px;
	display: none;
}

.nav-right a {
	float: left;
	padding: 0px 10px;
}

.login {
	padding-right: 9px !important;
	border-right: 1px solid #fff;
}

.nav-right input {
	float:left;
	border: none;
	height: 16.5px;
	width: 30px;
	margin-right: 35px;
	display: none;
}

.raturn {
	width: 730px;
	height: 20px;
	margin: 0px auto;
}

.raturn i {
	height: 20px;
	font-size: 20px;
	display: inline-block;
	color: #BDBDBD;
	float: left;
}

.raturn a {
	width: 54px;
	height: 20px;
	display: block;
	float: left;
}

.raturn span {
	font-size: 12px !important;
	margin-left: 5px;
	display: inline-block;
	height: 20px;
	line-height: 23px;
	float: left;
}

.raturn a:hover span {
	color: #44545E;
}
.raturn a:hover i {
	color: #44545E;
}

.friend-link {
	width: 48%;
	margin-top: 160px !important;
	margin-left: auto;
	margin-right: auto;
	font-size:12px;
	color:#333333;
	letter-spacing:0px;
}
.friend-link p{
	font-family:PingFangSC-Regular;
	font-size:12px;
	color:#a2a1a1;
	letter-spacing:0px;
	height:20px;
	line-height:20px;
}
.friend-link .flink-title{
	color:#333333;
}
/* footer */
.footer {
	width: 100%;
	min-width: 1100px;
	height: 55px;
	margin-top: 50px;
	text-align: center;
	color: #B0B0B0;
	font-size: 12px;
	line-height: 55px;
	font-weight: 300;
	float: left;
	cursor: default;
	z-index: 12;
}

.footer-border {
	width: 70%;
	height: 1px;
	margin: 0 auto;
	background-image: linear-gradient(-90deg, rgba(255,255,255,0.00) 0%, #D0D0D0 52%, rgba(255,255,255,0.00) 100%);
}

.footer a {
	padding-left: 10px;
	transition: all 0.5s;
}

.footer a:hover {
	color: #00c680;
	transition: all 0.5s;
}

@media only screen and (min-width:100px) and (max-width:1100px) {
	.friend-link{
		width:62%;
	}
	.header-img {
		display: none
	}

.header-nav {
		z-index: 1;
	}

body {
		min-width: 320px;
	}

.mobile-menu,
	.mobile-menu2 {
		display: block;
		cursor: pointer
	}

.header-bottom {
		display: none;
	}

.main-bg {
		top: 60px;
		min-width: 320px;
		width: 100%;
	}

.main{
		width: 90%;
		padding: 0;
	}

.footer {
		min-width: 320px;
	}

.logo {
		margin: 7px auto 11px;
		float: none;
	}

.logo-font {
		display: none;
	}

.sidebar {
		display: none;
	}

.right-side {
	    margin-left: 0;
	}

.main-right {
		float:none;
		width: 100%;
		padding: 0 10px;
		box-sizing: border-box;
	}

.tag-web {
		/*overflow: hidden;*/
	}

.tag-web li {
		width: 100%;
		/*margin: 10px 0;*/
		margin-bottom: 30px;
		box-sizing: border-box;
	}

.logo-btn {
		width: 161px;
		height: 32px;
		display: block;
		margin: auto;
	}

.tag-web li a[href]{
		width: 100%;
		height:147px;
		padding: 25px;
		box-sizing: border-box;
	}

.web-name {
		width: calc(100% - 65px);
	}
	.designer .web-name {
		height: 50px;
    	line-height: 50px;
	}

.header-left {
		float: none;
		position: relative;
		left: 50%;
		margin-left: -108px
	}

.ui {
		margin: 20px auto;
		float: none;
		width: 90%;
		text-align: center;
	}

.friend-link {
		display: none;
	}

.footer {
		float: none;
	    margin: 80px auto 0px;
	    width: 80%;
	    line-height: 1.8rem;
	    padding: 20px 0;
	}

.footer a {
		display: none;
	}

}

/*@media only screen and (min-width:1280px) and (max-width: 1365px) {
}

@media only screen and (min-width:1101px) and (max-width: 1279px) {	
}*/

/*
@media only screen and (min-width:1100px) and (max-width: 1365px) {
	.tag-web li {
		width: 164px;
	}
	.tag-web li a[href] {
		width: 134px;
	}
	.tag-web{
		min-width: 920px;
	}
	.cate-title{
		width:920px;
	}
}
*/
@media only screen and (min-width:1100px) {
	.tag-web{
		min-width: 1100px
	}
	.cate-title{
		width: 1078px
	}
	.main-sidebar{
		display: block;
	}
}